summaryrefslogtreecommitdiff
path: root/contrib/examples/git-difftool.perl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-25 13:22:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-25 13:22:39 -0700
commitf3fec40e8d8798e5313f05a9273aef932fe4519e (patch)
tree10f18d7bf621374a7cd1dc6dd3d7a1805800620e /contrib/examples/git-difftool.perl
parentMerge branch 'nd/complete-config-vars' (diff)
parentrebase: remove -p code from git-rebase--interactive.sh (diff)
downloadtgif-f3fec40e8d8798e5313f05a9273aef932fe4519e.tar.xz
Merge branch 'ag/rebase-p'
Separate "rebase -p" codepath out of "rebase -i" implementation to slim down the latter and make it easier to manage. * ag/rebase-p: rebase: remove -p code from git-rebase--interactive.sh rebase: use the new git-rebase--preserve-merges.sh rebase: strip unused code in git-rebase--preserve-merges.sh rebase: introduce a dedicated backend for --preserve-merges
Diffstat (limited to 'contrib/examples/git-difftool.perl')
0 files changed, 0 insertions, 0 deletions