summaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-19 23:44:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-19 23:44:07 -0800
commit8c5b85ce87d15e4db37a6408f03b0eb71dde080e (patch)
tree71b226a7452da6d52d07a60c9957424cd64d0a19 /t/t6021-merge-criss-cross.sh
parentgitweb: Hyperlink multiple git hashes on the same commit message line (diff)
parentMore friendly message when locking the index fails. (diff)
downloadtgif-8c5b85ce87d15e4db37a6408f03b0eb71dde080e.tar.xz
Merge branch 'maint'
* maint: More friendly message when locking the index fails. Document git blame --reverse. Documentation: Note file formats send-email accepts
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions