Skip to content

Commit

Permalink
git-read-tree: fix "--reset" handling
Browse files Browse the repository at this point in the history
  • Loading branch information
Linus Torvalds committed Jun 15, 2005
1 parent ce30a4b commit 7875b50
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions read-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,7 @@ int main(int argc, char **argv)
merge = 1;
stage = 1;
read_cache_unmerged();
continue;
}

/* "-m" stands for "merge", meaning we start in stage 1 */
Expand Down

0 comments on commit 7875b50

Please sign in to comment.