X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=10f2924f4df1eb29c1baf4484d2837377b6cfcb3;hb=ce4231ffa80da1888a668cc7c33f5349800ab4a3;hp=9d7bcaa38cc5c13e29c00ddd18c64202e98cb5f8;hpb=57be46fd213b448f66b1470187109e7d6ad6f475;p=git.git diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 9d7bcaa38..10f2924f4 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 ] [] +'git-rebase' [-v] [--merge] [--onto ] [] '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