Use branch names in 'git-rebase -m' conflict hunks.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:34:56 +0000 (02:34 -0500)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Dec 2006 09:07:32 +0000 (01:07 -0800)
commit0bb733c...1cb472a1a5b62381ff4037c6fb124e38
tree7035717...10ce4b595438a1a9535f0cd55ca82fb1copy hash to clipboard (tree)
parent42ea5a5...84a60d1e9280d81619779edd870c2fcccopy hash to clipboard (diff)
git-rebase.sh