From: Andreas Schwab <schwab@linux-m68k.org>
To: Dun Peal <dunpealer@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Is there a way to add a default `--squash` flag for all merges into a head?
Date: Mon, 07 Mar 2011 22:10:02 +0100 [thread overview]
Message-ID: <m2r5aibpsl.fsf@igel.home> (raw)
In-Reply-To: <9f02bed0-fa18-46b1-a3d3-346e1cc7dc01@k15g2000prk.googlegroups.com> (Dun Peal's message of "Mon, 7 Mar 2011 11:28:09 -0800 (PST)")
Dun Peal <dunpealer@gmail.com> writes:
> There's a configuration feaute `branch.<name>.rebase` for specifying
> that all merges into a branch (master in this case) would be done by
> rebase
That's not what it means. It means that a "git pull" is implicitly "git
pull --rebase". But if you do an explict merge it will not look at that
config setting.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2011-03-07 21:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-07 19:28 Is there a way to add a default `--squash` flag for all merges into a head? Dun Peal
2011-03-07 21:10 ` Andreas Schwab [this message]
2011-03-07 21:48 ` Dun Peal
2011-03-08 19:28 ` Junio C Hamano
2011-03-09 18:38 ` Dun Peal
2011-03-09 19:27 ` Junio C Hamano
2011-03-09 20:11 ` Dun Peal
2011-03-08 7:29 ` Jay Soffian
2011-03-10 19:38 ` Dun Peal
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=m2r5aibpsl.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=dunpealer@gmail.com \
--cc=git@vger.kernel.org \
/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.