diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-24 03:49:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-24 03:49:57 -0800 |
| commit | c7757948dc88ab744fd13acc3d0808cca31f9717 (patch) | |
| tree | b0e428bc5b77e22bb30b800973e75285c5771cae /Documentation | |
| parent | 9919b5ea8cfcd709b72e731af2ae62e011954ed9 (diff) | |
| parent | 0f03ca946142bd656c1af9ff811cb9efbc8314da (diff) | |
| download | git-c7757948dc88ab744fd13acc3d0808cca31f9717.tar.gz git-c7757948dc88ab744fd13acc3d0808cca31f9717.tar.xz | |
Merge branch 'pb/diffroot'
* pb/diffroot:
config option log.showroot to show the diff of root commits
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 9d3c71c3b..909076281 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -219,6 +219,12 @@ i18n.commitEncoding:: browser (and possibly at other places in the future or in other porcelains). See e.g. gitlink:git-mailinfo[1]. Defaults to 'utf-8'. +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. + Tools like gitlink:git-log[1] or gitlink:git-whatchanged[1], which + normally hide the root commit will now show it. True by default. + merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. |