summaryrefslogtreecommitdiff
path: root/commit-reach.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 19:28:07 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 19:28:07 +0900
commit04f879a7fb86048a0b6e9ea58a4d7d058bffde0b (patch)
treec7bf24526c6c81f0764c517d69f385f551f1a209 /commit-reach.c
parentMerge branch 'pw/rerere-autoupdate' (diff)
parentunpack-trees: fix oneway_merge accidentally carry over stage index (diff)
downloadtgif-04f879a7fb86048a0b6e9ea58a4d7d058bffde0b.tar.xz
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 'commit-reach.c')
0 files changed, 0 insertions, 0 deletions