summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_--pretty_--stat_initial
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-26 17:11:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-26 17:11:21 -0700
commit1c56d6f57adebf2a0ac910ca62a940dc7820bb68 (patch)
treec9fc0788d428a225cfa41d6f666de7dea369e0ee /t/t4013/diff.diff-tree_--pretty_--stat_initial
parentMerge branch 'tg/retire-scripted-stash' (diff)
parentpull: warn if the user didn't say whether to rebase or to merge (diff)
downloadtgif-1c56d6f57adebf2a0ac910ca62a940dc7820bb68.tar.xz
Merge branch 'ah/force-pull-rebase-configuration'
"git pull" learned to warn when no pull.rebase configuration exists, and neither --[no-]rebase nor --ff-only is given (which would result a merge). * ah/force-pull-rebase-configuration: pull: warn if the user didn't say whether to rebase or to merge
Diffstat (limited to 't/t4013/diff.diff-tree_--pretty_--stat_initial')
0 files changed, 0 insertions, 0 deletions