![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Michele Ballabio <barra_cuda@katamail.com> | |
| Sun, 20 Jul 2008 12:34:47 +0000 (14:34 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 20 Jul 2008 20:37:26 +0000 (13:37 -0700) | ||
| commit | 74f5b7fba420eb6b807db48d0ee7a000202f8225 | |
| tree | 102b124ac549cac5ecdcac1d0efbacc298d21e7f | tree | snapshot |
| parent | ec96224e215f1b2f143524afa339564271c11e12 | commit | 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>
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 | history | |
| t/t7600-merge.sh | diff | blob | history |