summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-14 10:46:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-14 12:12:15 -0700
commitd993ce1ed2f025708b0f78bed241466e35f1e8a0 (patch)
treeb5fcc45707d598f83f00b93474ec44e41a1ff271 /contrib/examples/git-merge-ours.sh
parentGit 2.8.4 (diff)
downloadtgif-d993ce1ed2f025708b0f78bed241466e35f1e8a0.tar.xz
blame: improve diagnosis for "--reverse NEW"
"git blame --reverse OLD..NEW -- PATH" tells us to start from the contents in PATH at OLD and observe how each line is changed while the history develops up to NEW, and report for each line the latest commit up to which the line survives in the original form. If you say "git blame --reverse NEW -- PATH" by mistake, we complain about the missing OLD, but we phrased it as "No commit to dig down to?" In this case, however, we are digging up from OLD, so say so. 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