summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-15 17:25:46 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-15 17:25:46 (GMT)
commit7875b50d1a9928e683299b283bfe94778b6c344e (patch)
tree49b3a2aa11195de3eb78b1442dad10e293d49845
parentce30a4b68ac220a2322dfe2a182194910143fafd (diff)
downloadgit-7875b50d1a9928e683299b283bfe94778b6c344e.zip
git-7875b50d1a9928e683299b283bfe94778b6c344e.tar.gz
git-7875b50d1a9928e683299b283bfe94778b6c344e.tar.bz2
git-read-tree: fix "--reset" handling
-rw-r--r--read-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/read-tree.c b/read-tree.c
index 0d94fe2..0d5ded5 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 */