diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-10-19 05:58:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-10-19 05:58:48 +0000 |
| commit | fbe0052a6097e716bc4ad9676c3c4d6f472a1d8d (patch) | |
| tree | a926e3dc0d853abf06ca1e0de4ae19340c8a5c72 /git-rebase.txt | |
| parent | 21c0b42d4578867273ad6bc14fb225d61aa6f67e (diff) | |
| download | git-htmldocs-fbe0052a6097e716bc4ad9676c3c4d6f472a1d8d.tar.gz | |
Autogenerated HTML docs for v1.4.3-g72bb
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 9d7bcaa38..10f2924f4 100644 --- a/git-rebase.txt +++ b/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 |