summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-03 15:30:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-03 15:30:24 -0700
commitb3bf469bf8d4cff6fbfef7db1c6f74b63906a317 (patch)
treeefcf1eff3f7801a688f0cdad940bfe995dfba427 /userdiff.c
parentMerge branch 'maint-1.8.2' into maint (diff)
parentsha1_name: fix error message for @{<N>}, @{<date>} (diff)
downloadtgif-b3bf469bf8d4cff6fbfef7db1c6f74b63906a317.tar.xz
Merge branch 'rr/die-on-missing-upstream' into maint
When a reflog notation is used for implicit "current branch", we did not say which branch, and worse said "branch ''". * rr/die-on-missing-upstream: sha1_name: fix error message for @{<N>}, @{<date>} sha1_name: fix error message for @{u}
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions