Re: [PATCH v3 3/3] Documentation/git-pull: document --[no-]autostash option
- From
Paul Tan <pyokagan@gmail.com>
- Date
- Mar 4, 2016, 15:56 UTC
- Message-ID
- <CACRoPnT1BsddXC9oqODkxHb==coKU6EKQiijk9=T0HYTFeCZVQ@mail.gmail.com>
- In-Reply-To
- <1457021601-9099-3-git-send-email-mehul.jain2029@gmail.com>
On Fri, Mar 4, 2016 at 12:13 AM, Mehul Jain <mehul.jain2029@gmail.com> wrote:
Show 22 quoted lines
> Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> > --- > Documentation/git-pull.txt | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt > index a62a2a6..a593972 100644 > --- a/Documentation/git-pull.txt > +++ b/Documentation/git-pull.txt > @@ -128,6 +128,21 @@ unless you have read linkgit:git-rebase[1] carefully. > --no-rebase:: > Override earlier --rebase. > > +--autostash:: > +--no-autostash:: > + Automatically create a temporary stash before the operation > + begins, and apply it after the operation ends. This means > + that you can run rebase on a dirty worktree. > ++ > +This option is only valid when '--rebase' option is used. > ++ > +The default is --no-autostash, unless rebase.autoStash configuration
By the way, there is a trailing space on this line.
Show 11 quoted lines
> +is set. > ++ > +[NOTE] > +Use with care: the final stash application after a successful > +rebase might result in non-trivial conflicts. > + > Options related to fetching > ~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > -- > 2.7.1.340.g69eb491.dirty
Regards, Paul