diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:36:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:36:14 -0700 |
| commit | 72d9b222a940c93a8d915c26a4d5d077e23be871 (patch) | |
| tree | b1bfaf4991ee3edf1410ef4e5dff3a5475746795 /Documentation | |
| parent | e251a7b34a85b0ac8a63a31e899e070ea2a330c7 (diff) | |
| parent | 4f62c2bc577bbb85b65f3261c7fab7ef74def4cd (diff) | |
| download | git-72d9b222a940c93a8d915c26a4d5d077e23be871.tar.gz git-72d9b222a940c93a8d915c26a4d5d077e23be871.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-log.txt | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6308026bf..ced5db6e0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1270,6 +1270,13 @@ log.date:: following alternatives: {relative,local,default,iso,rfc,short}. See linkgit:git-log[1]. +log.decorate:: + Print out the ref names of any commits that are shown by the log + command. If 'short' is specified, the ref name prefixes 'refs/heads/', + 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is + specified, the full ref name (including prefix) will be printed. + This is the same as the log commands '--decorate' option. + log.showroot:: If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index fb184ba18..57aa57467 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 |