motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "clean up merge squash and no-commit messages in pgm"

This commit is contained in:
Christian Halstrick 2013-04-09 03:09:33 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 0a824f5996 b42b50fdf5
commit 266ec24d49
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
View File

@ -69,7 +69,7 @@ mergeCheckoutConflict=error: Your local changes to the following files would be
mergeFailed=Automatic merge failed; fix conflicts and then commit the result mergeFailed=Automatic merge failed; fix conflicts and then commit the result
mergeCheckoutFailed=Please, commit your changes or stash them before you can merge. mergeCheckoutFailed=Please, commit your changes or stash them before you can merge.
mergeMadeBy=Merge made by the ''{0}'' strategy. mergeMadeBy=Merge made by the ''{0}'' strategy.
mergedSquashed=Squash commit -- not updating HEAD\nAutomatic merge went well; stopped before committing as requested mergedSquashed=Squash commit -- not updating HEAD
mergeWentWellStoppedBeforeCommitting=Automatic merge went well; stopped before committing as requested mergeWentWellStoppedBeforeCommitting=Automatic merge went well; stopped before committing as requested
metaVar_DAG=DAG metaVar_DAG=DAG
metaVar_KEY=KEY metaVar_KEY=KEY

1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java
View File

@ -182,6 +182,7 @@ protected void run() throws Exception {
case FAST_FORWARD_SQUASHED: case FAST_FORWARD_SQUASHED:
case MERGED_SQUASHED_NOT_COMMITTED: case MERGED_SQUASHED_NOT_COMMITTED:
outw.println(CLIText.get().mergedSquashed); outw.println(CLIText.get().mergedSquashed);
outw.println(CLIText.get().mergeWentWellStoppedBeforeCommitting);
break; break;
case ABORTED: case ABORTED:
throw die(CLIText.get().ffNotPossibleAborting); throw die(CLIText.get().ffNotPossibleAborting);