From: Junio C Hamano Date: Sun, 06 Nov 2011 04:14:23 GMT Subject: Re: [PATCH] Add abbreviated commit hash to rebase conflict message Message-ID: <7vy5vt7uqo.fsf@alter.siamese.dyndns.org> In-Reply-To: Sverre Rabbelier writes: > We had a little Git hackathon in Amsterdam today,... Ah, that was the context I was missing. >> What happens when threeway is not enabled, and especially when "git am" is >> used for applying patches, not within rebase? > > The same thing that already happens. I'm not sure what it is, but > whatever title/number is shown, the matching hash is now shown as > well. This patch does not change that behavior. I am puzzled, but that cannot be true. The existing message uses $msgnum and $FIRSTLINE but does not use $commit because it does not necessarily exist. What a value would the variable contain when I am applying your original patch message using "git am -s" (or "git am -s3")?