diff options
| author | Tomasz Zarna <tomasz.zarna@tasktop.com> | 2012-10-29 16:21:59 +0100 |
|---|---|---|
| committer | Tomasz Zarna <tomasz.zarna@tasktop.com> | 2012-11-16 11:04:13 +0100 |
| commit | 318f3d464307e3efd8342852310c17e71a7282fe (patch) | |
| tree | bcd251a7110555cd46c5ab18e5e673f52c214cd2 /org.eclipse.jgit.pgm/resources/org | |
| parent | cb0f0ad4cfe2733ff09c2ce4d3b72265ccfee281 (diff) | |
| download | jgit-318f3d464307e3efd8342852310c17e71a7282fe.tar.gz jgit-318f3d464307e3efd8342852310c17e71a7282fe.zip | |
Add support for --no-ff while merging
Bug: 394432
Change-Id: I373128c0ba949f9b24248874f77f3d68b50ccfd1
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/resources/org')
| -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 6f5c8eb685..cb1574f26c 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 @@ -18,6 +18,7 @@ branchNotFound=branch '{0}' not found. cacheTreePathInfo="{0}": {1} entries, {2} children cannotBeRenamed={0} cannot be renamed cannotChekoutNoHeadsAdvertisedByRemote=cannot checkout; no HEAD advertised by remote +cannotCombineSquashWithNoff=You cannot combine --squash with --no-ff. cannotCreateCommand=Cannot create command {0} cannotCreateOutputStream=cannot create output stream cannotDeatchHEAD=Cannot detach HEAD @@ -55,6 +56,7 @@ failedToLockTag=Failed to lock tag {0}: {1} fatalError=fatal: {0} fatalThisProgramWillDestroyTheRepository=fatal: This program will destroy the repository\nfatal:\nfatal:\nfatal: {0}\nfatal:\nfatal: To continue, add {1} to the command line\nfatal: fileIsRequired=argument file is required +ffNotPossibleAborting=Not possible to fast-forward, aborting. forcedUpdate=forced update fromURI=From {0} initializedEmptyGitRepositoryIn=Initialized empty Git repository in {0} @@ -160,6 +162,7 @@ unknownMergeStrategy=unknown merge strategy {0} specified unmergedPaths=Unmerged paths: unsupportedOperation=Unsupported operation: {0} untrackedFiles=Untracked files: +updating=Updating {0}..{1} usage_Blame=Show what revision and author last modified each line usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 service usage_CommitAll=commit all modified and deleted files |