Mercurial > public > mercurial-scm > hg
diff hgext/mq.py @ 7387:7e9a15fa6c8f
update help on git diffs
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 18 Nov 2008 15:35:34 -0600 |
parents | b6f5490effbf |
children | 040484030491 |
line wrap: on
line diff
--- a/hgext/mq.py Mon Nov 17 11:45:38 2008 -0800 +++ b/hgext/mq.py Tue Nov 18 15:35:34 2008 -0600 @@ -1607,7 +1607,7 @@ An existing changeset may be placed under mq control with --rev (e.g. qimport --rev tip -n patch will place tip under mq control). With --git, patches imported with --rev will use the git diff - format. See the gitdiffs help topic for information on why this is + format. See the diffs help topic for information on why this is important for preserving rename/copy information and permission changes. """ q = repo.mq @@ -1774,9 +1774,10 @@ -e, -m or -l set the patch header as well as the commit message. If none is specified, the header is empty and the commit message is '[mq]: PATCH'. - Use the --git option to keep the patch in the git extended diff format. - Read the gitdiffs help topic for more information on why this is - important for preserving permission changes and copy/rename information. + Use the --git option to keep the patch in the git extended diff + format. Read the diffs help topic for more information on why this + is important for preserving permission changes and copy/rename + information. """ msg = cmdutil.logmessage(opts) def getmsg(): return ui.edit(msg, ui.username()) @@ -1803,7 +1804,7 @@ hg add/remove/copy/rename work as usual, though you might want to use git-style patches (--git or [diff] git=1) to track copies and renames. - See the gitdiffs help topic for more information on the git diff format. + See the diffs help topic for more information on the git diff format. """ q = repo.mq message = cmdutil.logmessage(opts)