summaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-17 10:15:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-17 10:15:18 -0800
commit9f55a77777a43880882bad43daa8eac076ad9c48 (patch)
tree3a1ed5c5f6de7d64132ed702ab0b0668ce05e07f /mergetools/xxdiff
parentMerge branch 'mh/deref-symref-over-helper-transport' (diff)
parentrebase -i: use full object name internally throughout the script (diff)
downloadtgif-9f55a77777a43880882bad43daa8eac076ad9c48.tar.xz
Merge branch 'ks/rebase-i-abbrev'
The insn sheet "git rebase -i" creates did not fully honor core.abbrev settings. * ks/rebase-i-abbrev: rebase -i: use full object name internally throughout the script
Diffstat (limited to 'mergetools/xxdiff')
0 files changed, 0 insertions, 0 deletions