| commit | 6e54ae999870bb3482a0722f48a964cf66f62fbb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:12 +0000 (4 17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:12 +0000 (4 17:50 -0700) | ||
| tree | 06aeac82809fcf33e2f1c675e1760f7e7d5190a4 | treesnapshot (tar.gz zip) |
| parent | 9ff84b0dedb6ba9ad3565b235ade670e5562b8d9 | commitdiff |
| parent | 4f62c2bc577bbb85b65f3261c7fab7ef74def4cd | commitdiff |
Merge branch 'sd/log-decorate' into next
* 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