]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c3fe50b) | patch
Adapt merge message to C Git for remote-tracking branch 71/4671/1
authorRobin Stocker <robin@nibor.org>
Wed, 23 Nov 2011 16:03:21 +0000 (17:03 +0100)
committerRobin Stocker <robin@nibor.org>
Wed, 23 Nov 2011 16:03:21 +0000 (17:03 +0100)
commit8456cb3f2b5d31565a5800ca71ff248db4b3b5d0
treea9a0e82b09983e600221878fe6d9c553079f6c63tree | snapshot
parentc3fe50bb18ed4e4e5e563172be4076fa5901a18acommit | diff
Adapt merge message to C Git for remote-tracking branch

Commit 13931236b9ee2895a98ffdbdacbd0f895956d8a8 in C Git (2011-11-02)
changed the message format:

-Merge remote branch 'origin/foo'
+Merge remote-tracking branch 'origin/foo'

This change does the same in EGit to be consistent.

Change-Id: I7d9c5afa95771dbfe6079b5f89a10b248fee0172
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