From 7875b50d1a9928e683299b283bfe94778b6c344e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 15 Jun 2005 10:25:46 -0700 Subject: git-read-tree: fix "--reset" handling --- read-tree.c | 1 + 1 file changed, 1 insertion(+) (limited to 'read-tree.c') diff --git a/read-tree.c b/read-tree.c index 0d94fe214..0d5ded502 100644 --- a/read-tree.c +++ b/read-tree.c @@ -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 */ -- cgit v1.2.1