diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-06-18 18:54:11 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-18 13:18:52 -0700 |
| commit | b7b314711ad28b129e6c5916eee1f2036ffa94df (patch) | |
| tree | 0fb4e3ed64839a130403d49e6c310995c525933a /commit.c | |
| parent | pull --rebase: exit early when the working directory is dirty (diff) | |
| download | git-b7b314711ad28b129e6c5916eee1f2036ffa94df.tar.gz git-b7b314711ad28b129e6c5916eee1f2036ffa94df.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions