projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 13613ea) | patch
Fix "git-merge -s bogo" help text
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2008 05:07:55 +0000 (22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2008 05:57:55 +0000 (22:57 -0700)
commit131f9a108bba5a8b0bcba072696653ab3199911a
tree03d21803780a8271a546fa3d64a8345bb9ff1da0tree | snapshot
parent13613eac5bf886b37cc583462999419f91c98a17commit | diff
Fix "git-merge -s bogo" help text

It does not make much sense to reuse the output code from "git help" to
show the list of commands to the standard output while giving the error
message before that to the standard error stream.  This makes the output
consistent to that of the 1.6.0 version of "git merge".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge.c diff | blob | history
Git—the stupid content tracker