From: Junio C Hamano <gitster@pobox.com>
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: Tue, 08 Mar 2011 11:28:23 -0800 [thread overview]
Message-ID: <7vr5ahe7jc.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <b98e837f-a0ae-4061-aa09-b4d30e3b0522@b13g2000prf.googlegroups.com> (Dun Peal's message of "Mon, 7 Mar 2011 13:48:46 -0800 (PST)")
Dun Peal <dunpealer@gmail.com> writes:
> Sigh. You're right, what a silly man I am!!!
>
> I assume there's no way to do what I want, except maybe encourage
> everyone to use an alias for `git merge` that includes the flag.
I have a strong suspicion that it is not really what you want to always
use --squash merge, and everybody forced (or "encouraged") by you to do so
would hate you in the end.
The solution to whatever problem you are trying to solve should not be to
discard one of the most valuable information git keeps track of to avoid
the CVS/(old)SVN mess when performing repeated merges with a branch.
I also suspect that you might be delighted by "log --first-parent -m".
next prev parent reply other threads:[~2011-03-08 19:28 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
2011-03-07 21:48 ` Dun Peal
2011-03-08 19:28 ` Junio C Hamano [this message]
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=7vr5ahe7jc.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--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 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).