diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:07 +0900 |
| commit | 04f879a7fb86048a0b6e9ea58a4d7d058bffde0b (patch) | |
| tree | c7bf24526c6c81f0764c517d69f385f551f1a209 /Documentation/glossary-content.txt | |
| parent | fffbf7c6ba3a3653b92329f879d238e6fea4dfce (diff) | |
| parent | ab5af825db8beaf623f8ac95e4b4179ec1b9569e (diff) | |
| download | git-04f879a7fb86048a0b6e9ea58a4d7d058bffde0b.tar.gz | |
Merge branch 'nd/checkout-f-while-conflicted-fix'
"git checkout -f <branch>" while the index has an unmerged path
incorrectly left some paths in an unmerged state, which has been
corrected.
* nd/checkout-f-while-conflicted-fix:
unpack-trees: fix oneway_merge accidentally carry over stage index
Diffstat (limited to 'Documentation/glossary-content.txt')
0 files changed, 0 insertions, 0 deletions