summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2008-03-01 11:39:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-02 03:45:15 (GMT)
commitf32086becc2b46bda0680ef178935546a64ad693 (patch)
treea843e7460b5b805f5e4936126e92295aee791666 /Documentation
parent009c98ee170b36598548cc67c54826544cced108 (diff)
downloadgit-f32086becc2b46bda0680ef178935546a64ad693.zip
git-f32086becc2b46bda0680ef178935546a64ad693.tar.gz
git-f32086becc2b46bda0680ef178935546a64ad693.tar.bz2
Documentation/git-rebase.txt: Add --strategy to synopsys
Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index c11c645..4b10304 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/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