summaryrefslogtreecommitdiff
path: root/linear-assignment.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-09-03 13:49:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-03 13:49:28 -0700
commit0ba5a0b3ba34270b2b57b75f4cce8454a7cc5eeb (patch)
treeaa213172c369a9f33f1db08a13128564d19b791e /linear-assignment.h
parentMerge branch 'cb/ci-use-upload-artifacts-v1' (diff)
parentrebase --continue: remove .git/MERGE_MSG (diff)
downloadtgif-0ba5a0b3ba34270b2b57b75f4cce8454a7cc5eeb.tar.xz
Merge branch 'pw/rebase-skip-final-fix'
Checking out all the paths from HEAD during the last conflicted step in "git rebase" and continuing would cause the step to be skipped (which is expected), but leaves MERGE_MSG file behind in $GIT_DIR and confuses the next "git commit", which has been corrected. * pw/rebase-skip-final-fix: rebase --continue: remove .git/MERGE_MSG rebase --apply: restore some tests t3403: fix commit authorship
Diffstat (limited to 'linear-assignment.h')
0 files changed, 0 insertions, 0 deletions