diff options
Diffstat (limited to 'org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties')
-rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties index 5e38c04bb5..8bbcf5e841 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties @@ -66,6 +66,7 @@ listeningOn=Listening on {0} mergeConflict=CONFLICT(content): Merge conflict in {0} mergeFailed=Automatic merge failed; fix conflicts and then commit the result mergeMadeBy=Merge made by the ''{0}'' strategy. +mergedSquashed=Squash commit -- not updating HEAD\nAutomatic merge went well; stopped before committing as requested metaVar_DAG=DAG metaVar_KEY=KEY metaVar_arg=ARG @@ -127,6 +128,7 @@ notAnIndexFile={0} is not an index file notAnObject={0} is not an object notFound=!! NOT FOUND !! noteObjectTooLargeToPrint=Note object {0} too large to print +nothingToSquash=\ (nothing to squash) notOnAnyBranch=Not currently on any branch. onBranch=On branch {0} onBranchToBeBorn=You are on a branch yet to be born @@ -262,6 +264,7 @@ usage_showRefNamesMatchingCommits=Show ref names matching commits usage_showPatch=display patch usage_showRefNamesMatchingCommits=Show ref names matching commits usage_showNotes=Add this ref to the list of note branches from which notes are displayed +usage_squash=Squash commits as if a real merge happened, but do not make a commit or move the HEAD. usage_srcPrefix=show the source prefix instead of "a/" usage_symbolicVersionForTheProject=Symbolic version for the project usage_synchronizeIPZillaData=Synchronize IPZilla data |