diff options
| author | Tor Arne Vestbø <torarnv@gmail.com> | 2009-03-01 23:11:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-02 23:22:32 -0800 |
| commit | a9c3821ca2fec065260b4314d61337a7529aba5b (patch) | |
| tree | bd0a4c7fb22e9913c4713c44dff7b25c84c66828 /Documentation/config.txt | |
| parent | f474c526618d5d1111b585a6344e012fb731d3fe (diff) | |
| download | git-a9c3821ca2fec065260b4314d61337a7529aba5b.tar.gz | |
git-rebase: Add --stat and --no-stat for producing diffstat on rebase
The behavior of --verbose is unchanged, but uses a different state
variable internally, so that the meaning of verbose output may be
expanded without affecting the diffstat. This is also reflected in
the documentation.
The configuration option rebase.stat works the same was as merg.stat,
but the default is currently false.
Signed-off-by: Tor Arne Vestbø <torarnv@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 f5152c5038..6be2e9935b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1160,6 +1160,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 |