merging-rebase: be more suspicious about merging-rebase candidates
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 12 Jun 2013 21:17:45 +0000 (16:17 -0500)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 12 Jun 2013 21:17:45 +0000 (16:17 -0500)
commitb656c14ce48119d303be3d368b6af0ad59a3a0c1
treeb4134b31effe8260680977a4e4e9ffc548c951d9
parenta98fbeca14869277406b526dfa7ca0d6b576e025
merging-rebase: be more suspicious about merging-rebase candidates

Sometimes people commit all kinds of stuff before performing a merging
rebase, and that unfortunately also entails merges that look like '-s
ours' type merges. Therefore, it is not good enough to look whether
the merge looks like that, but we also have to ask the user if that's
the start of the latest merging rebase.

Only when we find that the commit subject contains 'merging-rebase',
we trust that we have found the correct merge.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
share/msysGit/merging-rebase.sh