Re: [PATCH] Add abbreviated commit hash to rebase conflict message

Heya,

On Sun, Nov 6, 2011 at 21:27, Junio C Hamano [off-list ref] wrote:

In what situation does it make sense to say "It came from _this_ commit"?

I think there is a separate variable that allows any part of the script if
we are being run as a backend of rebase or not, and that is the condition
you are looking for.

The closest I could find is:

                if test -f "$dotest/rebasing"

Which is exactly the case when commit is set. Do you prefer the "-f
$dotest/rebasing" test or the "-n $commit" one?

-- 
Cheers,

Sverre Rabbelier