* [PATCH] git-pull.txt: Mention branch.autosetuprebase
@ 2010-12-03 8:20 jari.aalto
2010-12-03 14:57 ` Jakub Narebski
2010-12-03 19:36 ` Junio C Hamano
0 siblings, 2 replies; 3+ messages in thread
From: jari.aalto @ 2010-12-03 8:20 UTC (permalink / raw)
To: git; +Cc: Jari Aalto
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.
+
[NOTE]
This is a potentially _dangerous_ mode of operation.
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase
2010-12-03 8:20 [PATCH] git-pull.txt: Mention branch.autosetuprebase jari.aalto
@ 2010-12-03 14:57 ` Jakub Narebski
2010-12-03 19:36 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Narebski @ 2010-12-03 14:57 UTC (permalink / raw)
To: jari.aalto; +Cc: git
jari.aalto@cante.net writes:
> 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>
> ---
> -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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase
2010-12-03 8:20 [PATCH] git-pull.txt: Mention branch.autosetuprebase jari.aalto
2010-12-03 14:57 ` Jakub Narebski
@ 2010-12-03 19:36 ` Junio C Hamano
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2010-12-03 19:36 UTC (permalink / raw)
To: jari.aalto; +Cc: git
jari.aalto@cante.net writes:
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-03 19:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-03 8:20 [PATCH] git-pull.txt: Mention branch.autosetuprebase jari.aalto
2010-12-03 14:57 ` Jakub Narebski
2010-12-03 19:36 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).