summaryrefslogtreecommitdiff
path: root/contrib/diff-highlight
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:33 -0700
commitb345b77b3a10dc94c2130669ce27bf61eddaabee (patch)
treea56cd02df9e9473611617cb2a4646975478932a0 /contrib/diff-highlight
parentMerge branch 'mb/filter-branch-optim' (diff)
parentgit-rebase--merge: modernize "git-$cmd" to "git $cmd" (diff)
downloadtgif-b345b77b3a10dc94c2130669ce27bf61eddaabee.tar.xz
Merge branch 'en/rebase-i-microfixes'
* en/rebase-i-microfixes: git-rebase--merge: modernize "git-$cmd" to "git $cmd" Fix use of strategy options with interactive rebases t3418: add testcase showing problems with rebase -i and strategy options
Diffstat (limited to 'contrib/diff-highlight')
0 files changed, 0 insertions, 0 deletions