From: Mike Hommey <mh@glandium.org>
Date: Sat, 1 Mar 2008 11:39:52 +0000 (+0100)
Subject: Documentation/git-rebase.txt: Add --strategy to synopsys
X-Git-Tag: v1.5.5-rc0~105
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f32086becc2b46bda0680ef178935546a64ad693;p=git.git

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>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index c11c6453e..4b1030474 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