summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-03-03 02:01:16 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-03-03 02:01:16 +0000
commit4f1d8c48d0527535cace5f7f7b25e546a7ba7dab (patch)
tree1770764183352dbfe1003de1f6bfb304db4a55cb /git-rebase.txt
parent69a98586dace45994f1eeeee63cf19d056bfc561 (diff)
downloadgit-htmldocs-4f1d8c48d0527535cace5f7f7b25e546a7ba7dab.tar.gz
Autogenerated HTML docs for v1.5.4.3-422-g34cd6
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index c11c6453e..4b1030474 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -9,6 +9,7 @@ SYNOPSIS
--------
[verse]
'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
+ [-s <strategy> | --strategy=<strategy>]
[-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]
[--onto <newbase>] <upstream> [<branch>]
'git-rebase' --continue | --skip | --abort