summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-11-10 18:02:13 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-11-10 18:02:13 +0900
commit0c51181ffb178a6581ecb471091cbd2d0c48f165 (patch)
tree475fe1611bbc83b20280597491f20f2ab3ac50ba /builtin/diff.c
parentMerge branch 'hv/bitshift-constants-in-blame' (diff)
parentrebase: hide --preserve-merges option (diff)
downloadtgif-0c51181ffb178a6581ecb471091cbd2d0c48f165.tar.xz
Merge branch 'js/rebase-deprecate-preserve-merges'
"git rebase --preserve-merges" has been marked as deprecated; this release stops advertising it in the "git rebase -h" output. * js/rebase-deprecate-preserve-merges: rebase: hide --preserve-merges option
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions