git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c261a87)
merge: ensure '--abort' option takes no arguments
authorChris Packham <redacted>
Wed, 14 Dec 2016 08:37:57 +0000 (21:37 +1300)
committerJunio C Hamano <redacted>
Wed, 14 Dec 2016 18:02:04 +0000 (10:02 -0800)
commit042e290da6aee0a9f21cd5890ccf231c266e177e
tree7056cb718d62c88dc75614b7f8b1a3c263bab346tree | snapshot
parentc261a87e704679203510d48ff4db7bc7006b8a5acommit | diff
merge: ensure '--abort' option takes no arguments

Like '--continue', the '--abort' option doesn't make any sense with
other options or arguments to 'git merge' so ensure that none are
present.

Signed-off-by: Chris Packham <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge.c diff | blob | history
t/t7600-merge.sh diff | blob | history
git clone https://git.99rst.org/PROJECT