summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-14 11:41:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-14 12:13:07 -0700
commite1d09701a4fa3a4d15dd005e2b698934e4ae9ae0 (patch)
tree09b892aeb03a45bd0f23cba26bd52afc5da924d2 /contrib/examples/git-merge-ours.sh
parentblame: improve diagnosis for "--reverse NEW" (diff)
downloadtgif-e1d09701a4fa3a4d15dd005e2b698934e4ae9ae0.tar.xz
blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."
Instead of always requiring both ends of a range, we could DWIM "OLD", which could be a misspelt "OLD..", to be a range that ends at the current commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions