From: Michael Radziej <mir@noris.de>
To: Cory Sharp <cory.sharp@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [Q] merge squash unexpected conflicts
Date: Thu, 14 May 2009 09:01:29 +0200 [thread overview]
Message-ID: <20090514070129.GL8212@noris.de> (raw)
In-Reply-To: <bb9d69200905132354h6b64171g24351840fb1d0893@mail.gmail.com>
On Wed, May 13, Cory Sharp wrote:
> Yeah I'm not quite getting it. Thanks for trying to explain, though.
git merge --squash is not a merge at all. It only creates a regular commit
with one parent. It is useful only in very special circumstances.
Michael
--
noris network AG - Deutschherrnstraße 15-19 - D-90429 Nürnberg -
Tel +49-911-9352-0 - Fax +49-911-9352-100
http://www.noris.de - The IT-Outsourcing Company
Vorstand: Ingo Kraupa (Vorsitzender), Joachim Astel, Hansjochen Klenk -
Vorsitzender des Aufsichtsrats: Stefan Schnabel - AG Nürnberg HRB 17689
next prev parent reply other threads:[~2009-05-14 7:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <bb9d69200905131706m61b0dda1xc347ca2e719ec142@mail.gmail.com>
2009-05-14 2:42 ` [Q] merge squash unexpected conflicts Cory Sharp
2009-05-14 3:21 ` Junio C Hamano
2009-05-14 3:57 ` Cory Sharp
2009-05-14 4:42 ` Junio C Hamano
2009-05-14 6:34 ` Cory Sharp
2009-05-14 6:42 ` Junio C Hamano
2009-05-14 6:54 ` Cory Sharp
2009-05-14 7:01 ` Michael Radziej [this message]
2009-05-14 18:25 ` Cory Sharp
2009-05-14 12:17 ` Michael J Gruber
2009-05-14 14:47 ` Cory Sharp
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=20090514070129.GL8212@noris.de \
--to=mir@noris.de \
--cc=cory.sharp@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.