Bug 29718

Summary:	manpage for git-pull mentions a non-valid option -m in a comment
Product:	Sisyphus	Reporter:	Ivan Zakharyaschev <imz>
Component:	git	Assignee:	placeholder <placeholder>
Status:	CLOSED FIXED	QA Contact:	qa-sisyphus
Severity:	minor
Priority:	P3	CC:	glebfm, ldv, placeholder, vt
Version:	unstable
Hardware:	all
OS:	Linux

Description Ivan Zakharyaschev 2014-01-14 06:05:58 MSK

git-1.8.4.4-alt1

The manpage for git-pull mentions -m in a comment:

       --edit, -e, --no-edit
           Invoke an editor before committing successful mechanical merge to further edit
           the auto-generated merge message, so that the user can explain and justify the
           merge. The --no-edit option can be used to accept the auto-generated message
           (this is generally discouraged). The --edit (or -e) option is still useful if
           you are giving a draft message with the -m option from the command line and
           want to edit it in the editor.

but it is not accepted actually:

git pull --no-edit -m 'Restoring config etc from server' origin server/GITCONFIG/master
fatal: No such remote or remote group: Restoring config etc from server

I'm not sure whether it is a bug of the implementation or of the documentation.

Comment 1 Ivan Zakharyaschev 2014-01-14 06:20:15 MSK

Sent upstream, too: http://permalink.gmane.org/gmane.comp.version-control.git/240386

Comment 2 Repository Robot 2014-01-25 19:27:53 MSK

git-1.8.4.5-alt1 -> sisyphus:

* Sat Jan 25 2014 Dmitry V. Levin <ldv@altlinux> 1.8.4.5-alt1
- Updated to maint v1.8.4.5.
- Applied upstream fix for git-pull manpage (closes: #29718).