git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 3, 2010, 19:36 UTC
Message-ID
<7v1v5yps12.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1291364454-9849-1-git-send-email-jari.aalto@cante.net>
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.
Previous: Jakub Narebski
Message 3 of 3 in “git-pull.txt: Mention branch.autosetuprebase”
  1. git-pull.txt: Mention branch.autosetuprebasejari.aalto@cante.net, Dec 3, 2010
  2. Jakub NarebskiDec 3, 2010
  3. Junio C HamanoDec 3, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.