diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-10 00:56:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-10 00:56:17 +0100 |
| commit | 66ecd2d05306fccc65e8d6a5f49100840ea7d3b6 (patch) | |
| tree | 159eaf1f118e602f3a397ede9dc2b386a96b627a /builtin/merge.c | |
| parent | Merge branch 'js/checkout-untracked-symlink' (diff) | |
| parent | Teach commit about CHERRY_PICK_HEAD (diff) | |
| download | git-66ecd2d05306fccc65e8d6a5f49100840ea7d3b6.tar.xz git-66ecd2d05306fccc65e8d6a5f49100840ea7d3b6.zip | |
Merge branch 'js/cherry-pick-usability'
* js/cherry-pick-usability:
Teach commit about CHERRY_PICK_HEAD
bash: teach __git_ps1 about CHERRY_PICK_HEAD
Introduce CHERRY_PICK_HEAD
t3507: introduce pristine-detach helper
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a89ddbb655..b4746ee55b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -999,6 +999,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix) else die("You have not concluded your merge (MERGE_HEAD exists)."); } + if (file_exists(git_path("CHERRY_PICK_HEAD"))) { + if (advice_resolve_conflict) + die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" + "Please, commit your changes before you can merge."); + else + die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."); + } resolve_undo_clear(); if (verbosity < 0) |