jari.aalto@xxxxxxxxx writes:
> From: Jari Aalto <jari.aalto@xxxxxxxxx>
>
> In "Options related to merging" mention also related option
> branch.autosetuprebase in git-config(1).
>
> Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx>
> ---
> Documentation/git-pull.txt | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
> index e47361f..7b4caac 100644
> --- a/Documentation/git-pull.txt
> +++ b/Documentation/git-pull.txt
> @@ -98,8 +98,9 @@ include::merge-options.txt[]
> fetched, the rebase uses that information to avoid rebasing
> non-local changes.
> +
> -See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make
> -`git pull` always use `{litdd}rebase` instead of merging.
> +See `branch.<name>.rebase` and `branch.autosetuprebase` in
> +linkgit:git-config[1] if you want to make `git pull` always use
> +`{litdd}rebase` instead of merging.
Thanks; will queue.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html