path: root/Documentation/git-reset.txt
diff options
authorStephan Beyer <>2009-12-30 05:54:47 (GMT)
committerJunio C Hamano <>2010-01-03 23:59:14 (GMT)
commitd0f379c2dcf7198d373b3c64444019bed2e24336 (patch)
tree1e40a82760901805088012985b96b29ea74f2bab /Documentation/git-reset.txt
parentc93966906f5d578d06eee0ead8745e608a6e18cf (diff)
reset: use "unpack_trees()" directly instead of "git read-tree"
This patch makes "reset_index_file()" call "unpack_trees()" directly instead of forking and execing "git read-tree". So the code is more efficient. And it's also easier to see which unpack_tree() options will be used, as we don't need to follow "git read-tree"'s command line parsing which is quite complex. As Daniel Barkalow found, there is a difference between this new version and the old one. The old version gives an error for "git reset --merge" with unmerged entries, and the new version does not when we reset the entries to some states that differ from HEAD. Instead, it resets the index entry and succeeds, while leaving the conflict markers in the corresponding file in the work tree (which will be corrected by the next patch). The code comes from the sequencer GSoC project: git:// (at commit 5a78908b70ceb5a4ea9fd4b82f07ceba1f019079) Mentored-by: Daniel Barkalow <> Mentored-by: Christian Couder <> Signed-off-by: Stephan Beyer <> Signed-off-by: Christian Couder <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-reset.txt')
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 2198c8e..cf2433d 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -122,7 +122,7 @@ entries:
X U A B --soft (disallowed)
--mixed X B B
--hard B B B
- --merge (disallowed)
+ --merge X B B
working index HEAD target working index HEAD