threads / patch / 25934

patchgit-pull.txt: Mention branch.autosetuprebase

Subject: [PATCH] git-pull.txt: Mention branch.autosetuprebase

## tl;dr

3 messages between Dec 3, 2010 and Dec 3, 2010. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

jari.aalto@cante.net· Dec 3, 2010, 08:20 UTC · lore

From: Jari Aalto <jari.aalto@cante.net>

In "Options related to merging" mention also related option branch.autosetuprebase in git-config(1).

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-pull.txt |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Show changes to Documentation/git-pull.txt +3 −2

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.
 +
 [NOTE]
 This is a potentially _dangerous_ mode of operation.

-- 
1.7.2.3

Jakub Narebski· Dec 3, 2010, 14:57 UTC · re: jari.aalto@cante.net · lore

Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase

jari.aalto@cante.net writes:

Show 7 quoted lines

> From: Jari Aalto <jari.aalto@cante.net>
> 
> In "Options related to merging" mention also related option
> branch.autosetuprebase in git-config(1).
> 
> Signed-off-by: Jari Aalto <jari.aalto@cante.net>
> ---

Show 5 quoted lines

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

Good catch.  Thanks.

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Junio C Hamano· Dec 3, 2010, 19:36 UTC · re: jari.aalto@cante.net · lore

Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase

jari.aalto@cante.net writes:

Show 23 quoted lines

> From: Jari Aalto <jari.aalto@cante.net>
>
> In "Options related to merging" mention also related option
> branch.autosetuprebase in git-config(1).
>
> Signed-off-by: Jari Aalto <jari.aalto@cante.net>
> ---
>  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.