From: Jakub Narebski <jnareb@gmail.com>
To: jari.aalto@cante.net
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase
Date: Fri, 03 Dec 2010 06:57:12 -0800 (PST) [thread overview]
Message-ID: <m3k4jq3nxo.fsf@localhost.localdomain> (raw)
In-Reply-To: <1291364454-9849-1-git-send-email-jari.aalto@cante.net>
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
next prev parent reply other threads:[~2010-12-03 14:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 8:20 [PATCH] git-pull.txt: Mention branch.autosetuprebase jari.aalto
2010-12-03 14:57 ` Jakub Narebski [this message]
2010-12-03 19:36 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3k4jq3nxo.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).