##// END OF EJS Templates
help: commands supporting --git point to the gitdiffs topic (issue1352)
Dirkjan Ochtman -
r7307:56380212 default
parent child Browse files
Show More
@@ -1600,7 +1600,8 b' def qimport(ui, repo, *filename, **opts)'
1600 An existing changeset may be placed under mq control with --rev
1600 An existing changeset may be placed under mq control with --rev
1601 (e.g. qimport --rev tip -n patch will place tip under mq control).
1601 (e.g. qimport --rev tip -n patch will place tip under mq control).
1602 With --git, patches imported with --rev will use the git diff
1602 With --git, patches imported with --rev will use the git diff
1603 format.
1603 format. See the gitdiffs help topic for information on why this is
1604 important for preserving rename/copy information and permission changes.
1604 """
1605 """
1605 q = repo.mq
1606 q = repo.mq
1606 q.qimport(repo, filename, patchname=opts['name'],
1607 q.qimport(repo, filename, patchname=opts['name'],
@@ -1765,6 +1766,10 b' def new(ui, repo, patch, *args, **opts):'
1765
1766
1766 -e, -m or -l set the patch header as well as the commit message. If none
1767 -e, -m or -l set the patch header as well as the commit message. If none
1767 is specified, the header is empty and the commit message is '[mq]: PATCH'.
1768 is specified, the header is empty and the commit message is '[mq]: PATCH'.
1769
1770 Use the --git option to keep the patch in the git extended diff format.
1771 Read the gitdiffs help topic for more information on why this is
1772 important for preserving permission changes and copy/rename information.
1768 """
1773 """
1769 msg = cmdutil.logmessage(opts)
1774 msg = cmdutil.logmessage(opts)
1770 def getmsg(): return ui.edit(msg, ui.username())
1775 def getmsg(): return ui.edit(msg, ui.username())
@@ -1791,6 +1796,7 b' def refresh(ui, repo, *pats, **opts):'
1791
1796
1792 hg add/remove/copy/rename work as usual, though you might want to use
1797 hg add/remove/copy/rename work as usual, though you might want to use
1793 git-style patches (--git or [diff] git=1) to track copies and renames.
1798 git-style patches (--git or [diff] git=1) to track copies and renames.
1799 See the gitdiffs help topic for more information on the git diff format.
1794 """
1800 """
1795 q = repo.mq
1801 q = repo.mq
1796 message = cmdutil.logmessage(opts)
1802 message = cmdutil.logmessage(opts)
@@ -1003,6 +1003,9 b' def diff(ui, repo, *pats, **opts):'
1003 Without the -a option, diff will avoid generating diffs of files
1003 Without the -a option, diff will avoid generating diffs of files
1004 it detects as binary. With -a, diff will generate a diff anyway,
1004 it detects as binary. With -a, diff will generate a diff anyway,
1005 probably with undesirable results.
1005 probably with undesirable results.
1006
1007 Use the --git option to generate diffs in the git extended diff
1008 format. Read the gitdiffs help topic for more information.
1006 """
1009 """
1007 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
1010 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
1008
1011
@@ -1036,6 +1039,9 b' def export(ui, repo, *changesets, **opts'
1036 it detects as binary. With -a, export will generate a diff anyway,
1039 it detects as binary. With -a, export will generate a diff anyway,
1037 probably with undesirable results.
1040 probably with undesirable results.
1038
1041
1042 Use the --git option to generate diffs in the git extended diff
1043 format. Read the gitdiffs help topic for more information.
1044
1039 With the --switch-parent option, the diff will be against the second
1045 With the --switch-parent option, the diff will be against the second
1040 parent. It can be useful to review a merge.
1046 parent. It can be useful to review a merge.
1041 """
1047 """
@@ -215,6 +215,9 b' diff repository (or selected files)'
215 it detects as binary. With -a, diff will generate a diff anyway,
215 it detects as binary. With -a, diff will generate a diff anyway,
216 probably with undesirable results.
216 probably with undesirable results.
217
217
218 Use the --git option to generate diffs in the git extended diff
219 format. Read the gitdiffs help topic for more information.
220
218 options:
221 options:
219
222
220 -r --rev revision
223 -r --rev revision
General Comments 0
You need to be logged in to leave comments. Login now