Re: [PATCH] Add support for merging from upstream by default.

From: Andreas Schwab <schwab@linux-m68k.org>
Date: Feb 5, 2011, 10:03 UTC
Message-ID: <m2k4he23z6.fsf@whitebox.home>
In-Reply-To: <1296866721-27818-1-git-send-email-jaredhance@gmail.com>

Jared Hance <jaredhance@gmail.com> writes:

Show 9 quoted lines

> diff --git a/builtin/merge.c b/builtin/merge.c
> index 42fff38..a69b69f 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -37,6 +37,7 @@ struct strategy {
>  };
>  
>  static const char * const builtin_merge_usage[] = {
> +        "git merge",

Doesn't that form take options as well?

>  	"git merge [options] <remote>...",

IOW, how about changing that to

  	"git merge [options] [<remote>...]",

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."