diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-03-11 23:56:19 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-03-11 23:56:19 +0000 |
| commit | ea6a764cc1ad1ab76cde6aa01c26aa1acb89739c (patch) | |
| tree | 18a718978275b3646c8d27739756a5a431bf4024 /git-rebase.txt | |
| parent | 5705393880d089d154d561c1abebb4acb411690e (diff) | |
| download | git-htmldocs-ea6a764cc1ad1ab76cde6aa01c26aa1acb89739c.tar.gz | |
Autogenerated HTML docs for v1.6.2-149-g6462
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index da3c38cd6..57bd333f0 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -192,6 +192,13 @@ Alternatively, you can undo the 'git-rebase' with git rebase --abort +CONFIGURATION +------------- + +rebase.stat:: + Whether to show a diffstat of what changed upstream since the last + rebase. False by default. + OPTIONS ------- <newbase>:: @@ -232,7 +239,15 @@ OPTIONS -v:: --verbose:: - Display a diffstat of what changed upstream since the last rebase. + Be verbose. Implies --stat. + +--stat:: + Show a diffstat of what changed upstream since the last rebase. The + diffstat is also controlled by the configuration option rebase.stat. + +-n:: +--no-stat:: + Do not show a diffstat as part of the rebase process. --no-verify:: This option bypasses the pre-rebase hook. See also linkgit:githooks[5]. |