mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-06-15 10:25:46 -07:00
parent ce30a4b68a
commit 7875b50d1a
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
read-tree.c
View File

@ -543,6 +543,7 @@ int main(int argc, char **argv)
merge = 1; merge = 1;
stage = 1; stage = 1;
read_cache_unmerged(); read_cache_unmerged();
continue;
} }
/* "-m" stands for "merge", meaning we start in stage 1 */ /* "-m" stands for "merge", meaning we start in stage 1 */