summaryrefslogtreecommitdiff
path: root/thread-utils.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:54 -0700
commit1bc505b4768e9e48592bebfff35e18c5277412da (patch)
tree38f8e86ea0d2a9fab9fa4e65efdf032415d01d5f /thread-utils.c
parentMerge branch 'ab/fsck-transfer-updates' (diff)
parentsequencer: don't die() on bogus user-edited timestamp (diff)
downloadtgif-1bc505b4768e9e48592bebfff35e18c5277412da.tar.xz
Merge branch 'es/rebase-i-author-script-fix'
The "author-script" file "git rebase -i" creates got broken when we started to move the command away from shell script, which is getting fixed now. * es/rebase-i-author-script-fix: sequencer: don't die() on bogus user-edited timestamp sequencer: fix "rebase -i --root" corrupting author header timestamp sequencer: fix "rebase -i --root" corrupting author header timezone sequencer: fix "rebase -i --root" corrupting author header
Diffstat (limited to 'thread-utils.c')
0 files changed, 0 insertions, 0 deletions