diff options
| author |  Johan Herland <johan@herland.net> | 2010-11-09 22:49:58 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:23:55 -0800 |
| commit | 2a22c1b35d6110e72d86a2fac4b68dbad0905adb (patch) | |
| tree | d4edcb49da9517972f8d11911acb80799e3f0b39 /Documentation/git-merge.txt | |
| parent | Provide 'git notes get-ref' to easily retrieve current notes ref (diff) | |
| download | tgif-2a22c1b35d6110e72d86a2fac4b68dbad0905adb.tar.xz | |
cmd_merge(): Parse options before checking MERGE_HEAD
Reorder the initial part of builtin/merge.c:cmd_merge() so that command-line
options are parsed _before_ we load the index and check for MERGE_HEAD
(and exits if it exists). This does not change the behaviour of 'git merge',
but is needed in preparation for the implementation of 'git merge --abort'
(which requires MERGE_HEAD to be present).
This patch has been improved by the following contributions:
- Junio C Hamano: fixup minor style issues
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions