diff options
| author |  Robert Shearman <rob@codeweavers.com> | 2006-10-03 17:29:31 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-10-04 15:02:04 -0700 |
| commit | b758789c202dc491555b698149afe4d4941f7cd5 (patch) | |
| tree | eabfefa05fd4a95a65f7f5ea6ae4120458ec3fcc /Documentation | |
| parent | git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. (diff) | |
| download | tgif-b758789c202dc491555b698149afe4d4941f7cd5.tar.xz | |
git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 9d7bcaa38c..10f2924f4d 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -7,7 +7,7 @@ git-rebase - Rebase local commits to a new head SYNOPSIS -------- -'git-rebase' [--merge] [--onto <newbase>] <upstream> [<branch>] +'git-rebase' [-v] [--merge] [--onto <newbase>] <upstream> [<branch>] 'git-rebase' --continue | --skip | --abort @@ -121,6 +121,9 @@ OPTIONS is used instead (`git-merge-recursive` when merging a single head, `git-merge-octopus` otherwise). This implies --merge. +-v, \--verbose:: + Display a diffstat of what changed upstream since the last rebase. + include::merge-strategies.txt[] NOTES |