diff options
| author |  Mike Hommey <mh@glandium.org> | 2008-03-01 12:39:52 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-01 19:45:15 -0800 |
| commit | f32086becc2b46bda0680ef178935546a64ad693 (patch) | |
| tree | a843e7460b5b805f5e4936126e92295aee791666 | |
| parent | CodingGuidelines: spell out how we use grep in our scripts (diff) | |
| download | tgif-f32086becc2b46bda0680ef178935546a64ad693.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-rebase.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index c11c6453ea..4b10304740 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 |