From: Steven Grimm <koreth@midwinter.com>
To: Josh England <jjengla@sandia.gov>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] Add post-merge hook.
Date: Tue, 04 Sep 2007 13:52:06 -0700 [thread overview]
Message-ID: <46DDC576.3080708@midwinter.com> (raw)
In-Reply-To: <1188937975.6192.59.camel@beauty>
Josh England wrote:
> I'm thinking that it
> will be sufficient to pass a flag indicating whether the working tree
> has been modified or not. The flag can be set for normal merge and
> fast-forward merges, and unset for up-to-dates and squash merges.
>
Squash merges modify the working tree. In fact, that's *all* they do --
they don't commit anything.
-Steve
next prev parent reply other threads:[~2007-09-04 20:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-30 22:40 [PATCH] Add post-merge hook jjengla
2007-08-30 23:07 ` Junio C Hamano
2007-09-04 16:25 ` Josh England
2007-09-04 17:25 ` Junio C Hamano
2007-09-04 19:36 ` Josh England
2007-09-04 20:03 ` Junio C Hamano
2007-09-04 20:32 ` Josh England
2007-09-04 20:52 ` Steven Grimm [this message]
2007-09-04 21:23 ` Josh England
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=46DDC576.3080708@midwinter.com \
--to=koreth@midwinter.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jjengla@sandia.gov \
/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).