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/resources | |
| 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/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index c03c64929d..2f480194a7 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -122,6 +122,7 @@ couldNotDeleteTemporaryIndexFileShouldNotHappen=Could not delete temporary index couldNotGetAdvertisedRef=Could not get advertised Ref for branch {0} couldNotLockHEAD=Could not lock HEAD couldNotReadIndexInOneGo=Could not read index in one go, only {0} out of {1} read +couldNotReadObjectWhileParsingCommit=Could not read an object while parsing commit {0} couldNotRenameDeleteOldIndex=Could not rename delete old index couldNotRenameTemporaryFile=Could not rename temporary file {0} to new location {1} couldNotRenameTemporaryIndexFileToIndex=Could not rename temporary index file to index |