X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=03e867a403a034e49e63fc0123970b44a199e8b5;hb=0f03ca946142bd656c1af9ff811cb9efbc8314da;hp=878eb6fe888b63573b5f1c9e2a8c62cfc9319708;hpb=e52775f43857f377aa2aa69f82ac2d2f26dc6297;p=git.git diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 878eb6fe8..03e867a40 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 @@ -170,6 +170,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