From: Junio C Hamano <gitster@pobox.com>
To: Sven Strickroth <sven@cs-ware.de>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred
Date: Tue, 08 Mar 2016 10:51:47 -0800 [thread overview]
Message-ID: <xmqq1t7kls58.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <56DF1EBD.8050503@cs-ware.de> (Sven Strickroth's message of "Tue, 8 Mar 2016 19:49:33 +0100")
Sven Strickroth <sven@cs-ware.de> writes:
> Here hook_arg1 would be always "merge" and never "squash"... Before my
> change it was only "squash" if no conflict occurred.
Oh, that wasn't an intended change. It was merely an illustration
of a possible restructuring of the flow to avoid having to have
identical read functions in two separate places.
next prev parent reply other threads:[~2016-03-08 18:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-05 10:38 Commit message not helpful after merge squash with conflicts Sven Strickroth
2016-03-08 4:17 ` [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred Sven Strickroth
2016-03-08 18:32 ` Junio C Hamano
2016-03-08 18:49 ` Sven Strickroth
2016-03-08 18:51 ` Junio C Hamano [this message]
2016-03-08 19:03 ` [PATCH] commit: do not lose SQUASH_MSG contents Sven Strickroth
2016-03-09 18:04 ` [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred Junio C Hamano
2016-03-09 20:24 ` Junio C Hamano
2016-03-13 18:39 ` [PATCH] commit: do not lose SQUASH_MSG contents Sven Strickroth
2016-03-14 18:19 ` Junio C Hamano
2016-03-14 20:19 ` Junio C Hamano
2016-03-21 22:29 ` Sven Strickroth
2016-03-21 22:34 ` Junio C Hamano
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=xmqq1t7kls58.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sven@cs-ware.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 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.