![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 May 2010 05:36:14 +0000 (22:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 May 2010 05:36:14 +0000 (22:36 -0700) | ||
| commit | 72d9b222a940c93a8d915c26a4d5d077e23be871 | |
| tree | b1bfaf4991ee3edf1410ef4e5dff3a5475746795 | tree | snapshot |
| parent | e251a7b34a85b0ac8a63a31e899e070ea2a330c7 | commit | diff |
| parent | 4f62c2bc577bbb85b65f3261c7fab7ef74def4cd | commit | diff |
Merge branch 'sd/log-decorate'
* sd/log-decorate:
log.decorate: only ignore it under "log --pretty=raw"
script with rev-list instead of log
log --pretty/--oneline: ignore log.decorate
log.decorate: usability fixes
Add `log.decorate' configuration variable.
git_config_maybe_bool()
Conflicts:
builtin/log.c
* sd/log-decorate:
log.decorate: only ignore it under "log --pretty=raw"
script with rev-list instead of log
log --pretty/--oneline: ignore log.decorate
log.decorate: usability fixes
Add `log.decorate' configuration variable.
git_config_maybe_bool()
Conflicts:
builtin/log.c
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-log.txt | diff1 | | diff2 | | blob | history |
| builtin/log.c | diff1 | | | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| git-stash.sh | diff1 | | diff2 | | blob | history |
| git-submodule.sh | diff1 | | diff2 | | blob | history |