summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-11-21 21:57:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-21 21:57:04 -0800
commit0f2140f105ded522ebfd784ae3e7f0885302513f (patch)
tree27651d488d9f3829abbf8e4c1581833a222d361d /mergetools/diffmerge
parentMerge branch 'hm/paint-hits-in-log-grep' (diff)
parentpull: should be noop when already-up-to-date (diff)
downloadtgif-0f2140f105ded522ebfd784ae3e7f0885302513f.tar.xz
Merge branch 'ev/pull-already-up-to-date-is-noop'
"git pull" with any strategy when the other side is behind us should succeed as it is a no-op, but doesn't. * ev/pull-already-up-to-date-is-noop: pull: should be noop when already-up-to-date
Diffstat (limited to 'mergetools/diffmerge')
0 files changed, 0 insertions, 0 deletions