diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-11 23:49:11 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 23:49:11 +0300 |
| commit | e43997979ecc69bb9b9720a080a3897738e00f19 (patch) | |
| tree | bb3885fa10e746a64b7ac7781fd4c51828842f4f /Documentation/config.txt | |
| parent | 8a396c02fdc7efa787be20074ae08059e3f80d14 (diff) | |
| parent | a334e1254c0c2d55f20b271872fbac9a6a67218b (diff) | |
Merge branch 'tv/rebase-stat'
* tv/rebase-stat:
git-pull: Allow --stat and --no-stat to be used with --rebase
git-rebase: Add --stat and --no-stat for producing diffstat on rebase
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 300ab25dcf..56bd781a16 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1170,6 +1170,10 @@ pull.octopus:: pull.twohead:: The default merge strategy to use when pulling a single branch. +rebase.stat:: + Whether to show a diffstat of what changed upstream since the last + rebase. False by default. + receive.fsckObjects:: If it is set to true, git-receive-pack will check all received objects. It will abort in the case of a malformed object or a |