Code

git-am: Mention --abort in usage string part of OPTIONS_SPEC
authorStephan Beyer <s-beyer@gmx.net>
Fri, 25 Jul 2008 18:22:23 +0000 (20:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Jul 2008 00:10:20 +0000 (17:10 -0700)
commit09f8d055f9c2af79a72f8d2a2f13698d9bbe6956
tree868c83459a3d5a9ee68eb6b64412e51ca84187bf
parent837c8767130ec71089e654f92cf24e8277a3bda5
git-am: Mention --abort in usage string part of OPTIONS_SPEC

The three separate lines for --skip, --resolved and --abort
are merged into one so that it is easy to see that they're
alternative and related options.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh