summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorKevin Sawicki2011-08-23 21:41:05 (EDT)
committer Christian Halstrick2011-10-04 05:39:51 (EDT)
commit565e4a06ef2eef4aa600b1401257bd87088f5666 (patch)
treebadd0843bb87494b74ba4fcaadb3918076175829
parent602c869d7a2b75f092ef96ab04fe1865ff317d5b (diff)
downloadjgit-565e4a06ef2eef4aa600b1401257bd87088f5666.zip
jgit-565e4a06ef2eef4aa600b1401257bd87088f5666.tar.gz
jgit-565e4a06ef2eef4aa600b1401257bd87088f5666.tar.bz2
Add missing comment text for mergeCommitTree parameterrefs/changes/62/4062/2
Change-Id: I35cef13d8be4f06515668f710fd508700b90f44d Signed-off-by: Kevin Sawicki <kevin@github.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
index 04f0077..68a53df 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
@@ -174,7 +174,7 @@ public class DirCacheCheckout {
* @param dc
* the (already locked) Dircache for this repo
* @param mergeCommitTree
- * the id of the tree of the
+ * the id of the tree we want to fast-forward to
* @throws IOException
*/
public DirCacheCheckout(Repository repo, ObjectId headCommitTree,