diff options
author | Mathias Kinzler <mathias.kinzler@sap.com> | 2011-01-31 12:12:48 +0100 |
---|---|---|
committer | Mathias Kinzler <mathias.kinzler@sap.com> | 2011-01-31 12:12:48 +0100 |
commit | b15b9d5df25b375108ca125b31338df637454865 (patch) | |
tree | 21da9f5d1b1a077274ec6fcd601446e62e9c4dbc /org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java | |
parent | 9ffcf2a8b3cb49c445fabd011b26a36e622a033c (diff) | |
download | jgit-b15b9d5df25b375108ca125b31338df637454865.tar.gz jgit-b15b9d5df25b375108ca125b31338df637454865.zip |
Proper handling of rebase during pull
After consulting with Christian Halstrick, it turned out that the
handling of rebase during pull was implemented incorrectly.
Change-Id: I40f03409e080cdfeceb21460150f5e02a016e7f4
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java')
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java index 4e3cb2035e..71fa26de48 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java @@ -182,6 +182,7 @@ public class JGitText extends TranslationBundle { /***/ public String couldNotGetAdvertisedRef; /***/ public String couldNotLockHEAD; /***/ public String couldNotReadIndexInOneGo; + /***/ public String couldNotReadObjectWhileParsingCommit; /***/ public String couldNotRenameDeleteOldIndex; /***/ public String couldNotRenameTemporaryFile; /***/ public String couldNotRenameTemporaryIndexFileToIndex; |