Merge branch 'maint-1.5.4' into maint-1.5.5

[git.git] / Documentation / git-rebase.txt

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index e4326d3322d45fafbc03ff96a696efc092c12522..e0412e0866db8f80e8bbc8f33caaa659461d90aa 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -9,6 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
 --------
 [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
        [-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]
        [--onto <newbase>] <upstream> [<branch>]
 'git-rebase' --continue | --skip | --abort


@@ -235,7 +236,7 @@ OPTIONS
 
 --whitespace=<nowarn|warn|error|error-all|strip>::
        This flag is passed to the `git-apply` program
 
 --whitespace=<nowarn|warn|error|error-all|strip>::
        This flag is passed to the `git-apply` program

-       (see gitlink:git-apply[1]) that applies the patch.
+       (see linkgit:git-apply[1]) that applies the patch.

 
 -i, \--interactive::
        Make a list of the commits which are about to be rebased.  Let the
 
 -i, \--interactive::
        Make a list of the commits which are about to be rebased.  Let the


@@ -261,8 +262,7 @@ hook if one exists.  You can use this hook to do sanity checks and
 reject the rebase if it isn't appropriate.  Please see the template
 pre-rebase hook script for an example.
 
 reject the rebase if it isn't appropriate.  Please see the template
 pre-rebase hook script for an example.
 

-You must be in the top directory of your project to start (or continue)
-a rebase.  Upon completion, <branch> will be the current branch.
+Upon completion, <branch> will be the current branch.

 
 INTERACTIVE MODE
 ----------------
 
 INTERACTIVE MODE
 ----------------


@@ -374,8 +374,8 @@ add other commits.  This can be used to split a commit into two:
   However, the working tree stays the same.
 
 - Now add the changes to the index that you want to have in the first
   However, the working tree stays the same.
 
 - Now add the changes to the index that you want to have in the first

-  commit.  You can use gitlink:git-add[1] (possibly interactively) and/or
-  gitlink:git-gui[1] to do that.
+  commit.  You can use linkgit:git-add[1] (possibly interactively) and/or
+  linkgit:git-gui[1] to do that.

 
 - Commit the now-current index with whatever commit message is appropriate
   now.
 
 - Commit the now-current index with whatever commit message is appropriate
   now.


@@ -386,7 +386,7 @@ add other commits.  This can be used to split a commit into two:
 
 If you are not absolutely sure that the intermediate revisions are
 consistent (they compile, pass the testsuite, etc.) you should use
 
 If you are not absolutely sure that the intermediate revisions are
 consistent (they compile, pass the testsuite, etc.) you should use

-gitlink:git-stash[1] to stash away the not-yet-committed changes
+linkgit:git-stash[1] to stash away the not-yet-committed changes

 after each commit, test, and amend the commit if fixes are necessary.
 
 
 after each commit, test, and amend the commit if fixes are necessary.
 
 


@@ -401,4 +401,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite