summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-05-01 14:14:44 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-01 14:14:44 +0900
commit0998b648d6addfb7eaf17e1aa4e7fb1dbefac548 (patch)
tree80376d1e5a944d055086022cfb99d67bbc7c0835 /xdiff-interface.c
parentMerge branch 'ls/travis-stricter-linux32-builds' (diff)
parentrebase -i: reread the todo list if `exec` touched it (diff)
downloadtgif-0998b648d6addfb7eaf17e1aa4e7fb1dbefac548.tar.xz
Merge branch 'sh/rebase-i-reread-todo-after-exec'
"git rebase -i" failed to re-read the todo list file when the command specified with the `exec` instruction updated it. * sh/rebase-i-reread-todo-after-exec: rebase -i: reread the todo list if `exec` touched it
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions