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/resources | |
| 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/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 8018ab9baa..70f1313a40 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -31,6 +31,7 @@ branchNameInvalid=Branch name {0} is not allowed cachedPacksPreventsIndexCreation=Using cached packs prevents index creation cannotBeCombined=Cannot be combined. cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included. +cannotCombineSquashWithNoff=Cannot combine --squash with --no-ff. cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RevFilter {1}. cannotCommitOnARepoWithState=Cannot commit on a repo with state: {0} cannotCommitWriteTo=Cannot commit write to {0} |