diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
| commit | eb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch) | |
| tree | ca4b12fcea8cc51c42b66ee456255ee4ea85b203 /git-rebase.txt | |
| parent | e2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff) | |
| download | git-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz | |
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index cc48beec7..716641435 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -213,19 +213,22 @@ OPTIONS --skip:: Restart the rebasing process by skipping the current patch. --m, \--merge:: +-m:: +--merge:: Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. --s <strategy>, \--strategy=<strategy>:: +-s <strategy>:: +--strategy=<strategy>:: Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead (`git-merge-recursive` when merging a single head, `git-merge-octopus` otherwise). This implies --merge. --v, \--verbose:: +-v:: +--verbose:: Display a diffstat of what changed upstream since the last rebase. -C<n>:: @@ -238,12 +241,14 @@ OPTIONS This flag is passed to the `git-apply` program (see linkgit:git-apply[1]) that applies the patch. --i, \--interactive:: +-i:: +--interactive:: Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below). --p, \--preserve-merges:: +-p:: +--preserve-merges:: Instead of ignoring merges, try to recreate them. This option only works in interactive mode. |