Re: [PATCH] Correct git-pull documentation
Show 5 quoted lines
> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
> index 179bdfc..f734f18 100644
> --- a/Documentation/git-pull.txt
> +++ b/Documentation/git-pull.txt
>
Show 17 quoted lines
> @@ -28,17 +29,12 @@ include::merge-options.txt[]
> :git-pull: 1
> include::fetch-options.txt[]
>
> -include::pull-fetch-param.txt[]
> -
> -include::urls-remotes.txt[]
> -
> -include::merge-strategies.txt[]
> -
> \--rebase::
> Instead of a merge, perform a rebase after fetching. If
> there is a remote ref for the upstream branch, and this branch
> was rebased since last fetched, the rebase uses that information
> - to avoid rebasing non-local changes.
> + to avoid rebasing non-local changes. This if the default if
>
... This *is* the default if
Show 5 quoted lines
> + `branch.<name>.rebase` is set.
> +
> *NOTE:* This is a potentially _dangerous_ mode of operation.
> It rewrites history, which does not bode well when you
>
--
-jul-
Nagy Balázs <js@iksz.hu>