git-read-tree: fix "--reset" handling

This commit is contained in:
Linus Torvalds 2005-06-15 10:25:46 -07:00
parent ce30a4b68a
commit 7875b50d1a

View File

@ -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 */