diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-17 10:20:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-17 10:20:49 -0800 |
| commit | 8a3d203bd02bec48a02557961899d81da172fa23 (patch) | |
| tree | 8d85296b6d6dda98eb01cb17198ecb06d25a8eed /Documentation/git-log.txt | |
| parent | eb734454098fb68af1fb0e157dd5e67bb15a602d (diff) | |
| download | git-8a3d203bd02bec48a02557961899d81da172fa23.tar.gz | |
log.decorate: usability fixes
The configuration is meant to suppliment --decorate command line option
that can be used as a boolean to turn the feature on, so it is natural
to expect
[log]
decorate
decorate = yes
to work. The original commit would segfault with the first one, and
would not understand the second one.
Once a user has this configuration in ~/.gitconfig, there needs to be a
way to override it from the command line. Add --no-decorate option to
log family and also allow --decorate=no to mean the same thing. Since
we allow setting log.decorate to 'true', the command line also should
accept --decorate=yes and behave accordingly.
New tests in t4202 are designed to exercise the interaction between the
configuration variable and the command line option that overrides it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
| -rw-r--r-- | Documentation/git-log.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 0e39bb61ee..64bb879fed 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -37,7 +37,8 @@ include::diff-options.txt[] and <until>, see "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1]. ---decorate[=short|full]:: +--no-decorate:: +--decorate[=short|full|no]:: Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the |