]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec96224) | patch
builtin-merge.c: Fix option parsing
authorMichele Ballabio <barra_cuda@katamail.com>
Sun, 20 Jul 2008 12:34:47 +0000 (14:34 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Jul 2008 20:37:26 +0000 (13:37 -0700)
commit74f5b7fba420eb6b807db48d0ee7a000202f8225
tree102b124ac549cac5ecdcac1d0efbacc298d21e7ftree | snapshot
parentec96224e215f1b2f143524afa339564271c11e12commit | diff
builtin-merge.c: Fix option parsing

Now "git merge -m" needs a message, and errors out with the usage
text if none is given.
This way, t7600-merge.sh is fixed.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge.c diff | blob | blame | history
t/t7600-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.