| commit | b7b314711ad28b129e6c5916eee1f2036ffa94df | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Thu, 18 Jun 2015 10:54:11 +0000 (18 18:54 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Jun 2015 20:18:52 +0000 (18 13:18 -0700) | ||
| tree | 0fb4e3ed64839a130403d49e6c310995c525933a | treesnapshot (tar.gz zip) |
| parent | 8944969c20e80f13965905ecd2ccccac36a34831 | commitdiff |
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>
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 | diffblobblamehistory |