diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-15 10:25:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-15 10:25:46 -0700 |
| commit | 7875b50d1a9928e683299b283bfe94778b6c344e (patch) | |
| tree | 49b3a2aa11195de3eb78b1442dad10e293d49845 | |
| parent | Update tutorial a bit for scripted helpers. (diff) | |
| download | tgif-7875b50d1a9928e683299b283bfe94778b6c344e.tar.xz | |
git-read-tree: fix "--reset" handling
| -rw-r--r-- | read-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/read-tree.c b/read-tree.c index 0d94fe214d..0d5ded5026 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 */ |