Re: merge --no-ff is NOT mentioned in help
- From
Mike Rappazzo <rappazzo@gmail.com>
- Date
- Nov 16, 2016, 15:57 UTC
- Message-ID
- <CANoM8SVXeeZsc40xgVqZep_9oT=J2h4mOO0Ksn+kb0g8Ct=KrQ@mail.gmail.com>
- In-Reply-To
- <2C8817BDA27E034F8E9A669458E375EF2BE689@APSWP0428.ms.ds.uhc.com>
(Please reply inline)
On Wed, Nov 16, 2016 at 10:48 AM, Vanderhoof, Tzadik <tzadik.vanderhoof@optum360.com> wrote:
Show 38 quoted lines
> I am running: git version 2.10.1.windows.1 > > I typed: git merge -h > > and got: > > usage: git merge [<options>] [<commit>...] > or: git merge [<options>] <msg> HEAD <commit> > or: git merge --abort > > -n do not show a diffstat at the end of the merge > --stat show a diffstat at the end of the merge > --summary (synonym to --stat) > --log[=<n>] add (at most <n>) entries from shortlog to merge commit message > --squash create a single commit instead of doing a merge > --commit perform a commit if the merge succeeds (default) > -e, --edit edit message before committing > --ff allow fast-forward (default) > --ff-only abort if fast-forward is not possible > --rerere-autoupdate update the index with reused conflict resolution if possible > --verify-signatures verify that the named commit has a valid GPG signature > -s, --strategy <strategy> > merge strategy to use > -X, --strategy-option <option=value> > option for selected merge strategy > -m, --message <message> > merge commit message (for a non-fast-forward merge) > -v, --verbose be more verbose > -q, --quiet be more quiet > --abort abort the current in-progress merge > --allow-unrelated-histories > allow merging unrelated histories > --progress force progress reporting > -S, --gpg-sign[=<key-id>] > GPG sign commit > --overwrite-ignore update ignored files (default) > > Notice there is NO mention of the "--no-ff" option
I understand. On my system I can reproduce this by providing a bad argument to `git merge`. This is the output from the arg setup. For "boolean" arguments (like '--ff'), there is an automatic counter argument with "no-" in there ('--no-ff') to disable the option. Maybe it would make sense to word the output to include both.
Show 31 quoted lines
> > -----Original Message----- > From: Mike Rappazzo [mailto:rappazzo@gmail.com] > Sent: Wednesday, November 16, 2016 7:37 AM > To: Vanderhoof, Tzadik > Cc: git@vger.kernel.org > Subject: Re: merge --no-ff is NOT mentioned in help > > On Wed, Nov 16, 2016 at 10:16 AM, Vanderhoof, Tzadik <tzadik.vanderhoof@optum360.com> wrote: >> When I do: "git merge -h" to get help, the option "--no-ff" is left out of the list of options. > > I am running git version 2.10.0, and running git merge --help contains these lines: > > --ff > When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior. > > --no-ff > Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag. > > --ff-only > Refuse to merge and exit with a non-zero status unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward. > > > > This e-mail, including attachments, may include confidential and/or > proprietary information, and may be used only by the person or entity > to which it is addressed. If the reader of this e-mail is not the intended > recipient or his or her authorized agent, the reader is hereby notified > that any dissemination, distribution or copying of this e-mail is > prohibited. If you have received this e-mail in error, please notify the > sender by replying to this message and delete this e-mail immediately.