From: Cory Sharp <cory.sharp@gmail.com>
To: Michael Radziej <mir@noris.de>
Cc: git@vger.kernel.org
Subject: Re: [Q] merge squash unexpected conflicts
Date: Thu, 14 May 2009 11:25:23 -0700 [thread overview]
Message-ID: <bb9d69200905141125i4a8ffaa8j6aea2a6c44de0c7d@mail.gmail.com> (raw)
In-Reply-To: <20090514070129.GL8212@noris.de>
On Thu, May 14, 2009 at 12:01 AM, Michael Radziej <mir@noris.de> wrote:
> git merge --squash is not a merge at all. ...
> It is useful only in very special circumstances.
You're right. I (incorrectly) thought I had to use --squash to
properly interface with an svn branch and trunk through git-svn. I
thought not using squash would trigger hundreds of commits - it
doesn't, nice things happen with just "merge".
Thanks everyone for helping me,
Cory
next prev parent reply other threads:[~2009-05-14 18:25 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
2009-05-14 18:25 ` Cory Sharp [this message]
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=bb9d69200905141125i4a8ffaa8j6aea2a6c44de0c7d@mail.gmail.com \
--to=cory.sharp@gmail.com \
--cc=git@vger.kernel.org \
--cc=mir@noris.de \
/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).