diff options
| author | Robin Stocker <robin@nibor.org> | 2011-11-23 17:03:21 +0100 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2011-11-23 17:03:21 +0100 |
| commit | 8456cb3f2b5d31565a5800ca71ff248db4b3b5d0 (patch) | |
| tree | a9a0e82b09983e600221878fe6d9c553079f6c63 /org.eclipse.jgit | |
| parent | c3fe50bb18ed4e4e5e563172be4076fa5901a18a (diff) | |
| download | jgit-8456cb3f2b5d31565a5800ca71ff248db4b3b5d0.tar.gz jgit-8456cb3f2b5d31565a5800ca71ff248db4b3b5d0.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java index 11f3b7a3fd..1a26ecfe1f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java @@ -99,8 +99,8 @@ public class MergeMessageFormatter { listings.add(joinNames(branches, "branch", "branches")); if (!remoteBranches.isEmpty()) - listings.add(joinNames(remoteBranches, "remote branch", - "remote branches")); + listings.add(joinNames(remoteBranches, "remote-tracking branch", + "remote-tracking branches")); if (!tags.isEmpty()) listings.add(joinNames(tags, "tag", "tags")); |