projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fixed a typo in Documentation/git-cvsimport-script.txt.
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
0d94fe2
..
0d5ded5
100644
(file)
--- 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 */