diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-18 22:08:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-18 22:08:31 -0700 |
| commit | a420585f3896c86a8641a0d46483acd2036cb5a3 (patch) | |
| tree | c8bc056db2a77b2a7f236b71289c7b67e40d6773 /Documentation | |
| parent | a4c6ae5a76f6f18876be69e5c1684f425e04bfc1 (diff) | |
| parent | b758789c202dc491555b698149afe4d4941f7cd5 (diff) | |
| download | git-a420585f3896c86a8641a0d46483acd2036cb5a3.tar.gz | |
Merge branch 'rs/rebase'
* rs/rebase:
git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
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 |