My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8944969) | patch
pull --rebase: error on no merge candidate cases
authorPaul Tan <pyokagan@gmail.com>
Thu, 18 Jun 2015 10:54:11 +0000 (18:54 +0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2015 20:18:52 +0000 (13:18 -0700)
commitb7b314711ad28b129e6c5916eee1f2036ffa94df
tree0fb4e3ed64839a130403d49e6c310995c525933atree | snapshot
parent8944969c20e80f13965905ecd2ccccac36a34831commit | diff
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>
builtin/pull.c diff | blob | history
The core git plumbing