summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-18 10:54:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-18 20:18:52 (GMT)
commitb7b314711ad28b129e6c5916eee1f2036ffa94df (patch)
tree0fb4e3ed64839a130403d49e6c310995c525933a /builtin/blame.c
parent8944969c20e80f13965905ecd2ccccac36a34831 (diff)
downloadgit-b7b314711ad28b129e6c5916eee1f2036ffa94df.zip
git-b7b314711ad28b129e6c5916eee1f2036ffa94df.tar.gz
git-b7b314711ad28b129e6c5916eee1f2036ffa94df.tar.bz2
pull --rebase: error on no merge candidate cases
Tweak the error messages printed by die_no_merge_candidates() to take into account that we may be "rebasing against" rather than "merging with". Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/blame.c')
0 files changed, 0 insertions, 0 deletions