From: Jakub Narebski <jnareb@gmail.com>
To: "R. Tyler Ballance" <tyler@slide.com>
Cc: git@vger.kernel.org
Subject: Re: Forcing --no-ff on pull
Date: Tue, 09 Dec 2008 01:46:05 -0800 (PST) [thread overview]
Message-ID: <m3vdtthebu.fsf@localhost.localdomain> (raw)
In-Reply-To: <1228815240.18611.48.camel@starfruit.local>
"R. Tyler Ballance" <tyler@slide.com> writes:
> Is there a header macro I can define or a config option I could define
> to make --no-ff on `git pull` implicit instead of explicit? Making sure
> we are always generating merge commits as a "just-in-case" safe guard
> about merge-happy developers who think after hitting enter? :)
branch.<name>.mergeoptions ?
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2008-12-09 9:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-09 9:34 Forcing --no-ff on pull R. Tyler Ballance
2008-12-09 9:46 ` Jakub Narebski [this message]
2008-12-09 9:49 ` Lars Hjemli
2008-12-09 10:12 ` R. Tyler Ballance
2008-12-09 10:31 ` Lars Hjemli
2008-12-09 10:45 ` R. Tyler Ballance
2008-12-09 10:57 ` Lars Hjemli
2008-12-09 16:39 ` Stephen Haberman
2008-12-09 10:00 ` Johannes Sixt
2008-12-09 10:17 ` Nanako Shiraishi
2008-12-09 10:38 ` R. Tyler Ballance
2008-12-09 10:57 ` Jeff King
2008-12-09 14:36 ` Boyd Stephen Smith Jr.
2008-12-09 22:32 ` Daniel Barkalow
2008-12-10 19:07 ` Stephen Haberman
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=m3vdtthebu.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=tyler@slide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.