]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 20c8298) | patch
CheckoutCommand: Support checking out ours and theirs 84/7884/5
authorRobin Stocker <robin@nibor.org>
Sat, 22 Sep 2012 23:57:20 +0000 (01:57 +0200)
committerChris Aniszczyk <zx@twitter.com>
Fri, 16 Nov 2012 18:31:32 +0000 (10:31 -0800)
commitcdaded26b0711bfd99cc2990db25b4562540c3b5
treee036b301f6d625f19115c6602fbec7adf7d19740tree | snapshot
parent20c829838ac101cf595ee9d4575d6b95a6d2c99dcommit | diff
CheckoutCommand: Support checking out ours and theirs

The checkoutPaths body is split into two implementations, depending on
whether we are checking out the index or a branch. This improves
readability, as in the index case we now also need to have access to
DirCacheIterator.

Bug: 390147
Change-Id: I99fd599b25b2ace9bdd84535a56565286a3cb7f1
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PathCheckoutCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit