comparison mercurial/commands.py @ 7307:56380212d630

help: commands supporting --git point to the gitdiffs topic (issue1352)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 03 Nov 2008 16:31:47 +0100
parents d14c25e823ba
children b6f5490effbf
comparison
equal deleted inserted replaced
7306:8e46e59aaf4c 7307:56380212d630
1001 to its parent. 1001 to its parent.
1002 1002
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
1009 m = cmdutil.match(repo, pats, opts) 1012 m = cmdutil.match(repo, pats, opts)
1010 patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts)) 1013 patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts))
1033 %r zero-padded changeset revision number 1036 %r zero-padded changeset revision number
1034 1037
1035 Without the -a option, export will avoid generating diffs of files 1038 Without the -a option, export will avoid generating diffs of files
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.
1041
1042 Use the --git option to generate diffs in the git extended diff
1043 format. Read the gitdiffs help topic for more information.
1038 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 """
1042 if not changesets: 1048 if not changesets: