From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Sep 2007 23:39:45 GMT
Subject: Re: Conflicting "-n" short options for git-pull?
Message-ID: <7vfy1f8pmm.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200709152114.54985.elendil@planet.nl>

Frans Pop <elendil@planet.nl> writes:

> According to the man page for git-pull from git-core 1.5.3.1 (Debian 
> package), two options are defined as having the short option "-n":
>
>      -n, --no-summary
>          Do not show diffstat at the end of the merge.
> [...]
>      -n, --no-tags
>          By default, git-fetch fetches tags that point at objects that are
>          downloaded from the remote repository and stores them locally. This
>          option disables this automatic tag following.

The manpage option descriptions are shared between the
commands.  Maybe we should drop mention of the shorthand form.

When git-fetch is used -n means --no-tags because there is no
other -n; when git-pull indirectly invokes git-fetch, you need
to spell it --no-tags because --no-summary takes precedence.