]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eb9dba2) | patch
Fix "into" part of merge message for HEAD 38/3338/2
authorRobin Stocker <robin@nibor.org>
Thu, 5 May 2011 15:33:01 +0000 (17:33 +0200)
committerRobin Stocker <robin@nibor.org>
Thu, 5 May 2011 15:50:44 +0000 (17:50 +0200)
commit7546e3b4c5612e5f6ee564d0d01b17533e7e0b3b
tree8e7e81579316132cfab6364073685781143fc0cftree | snapshot
parenteb9dba2fde1b0581ecae1e509a981a6158285f39commit | diff
Fix "into" part of merge message for HEAD

Merging into a non-master branch would result in the following message:

  Merge branch 'a' into HEAD

Now the merge message is correct:

  Merge branch 'a' into b

Change-Id: I488f97190e4c1711c23a7a3cbd64f8b13a87bbac
Signed-off-by: Robin Stocker <robin@nibor.org>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit