Mercurial > hg
changeset 3031:eba7c78c80fe
Merge with crew
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 30 Aug 2006 10:21:02 -0700 |
| parents | 5a17423f88d7 (diff) ea734528ce04 (current diff) |
| children | cef3e7071443 51b7f792e473 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/patchbomb.py Wed Aug 30 19:58:54 2006 +0200 +++ b/hgext/patchbomb.py Wed Aug 30 10:21:02 2006 -0700 @@ -205,7 +205,8 @@ commands.export(ui, repo, *revs, **{'output': exportee(patches), 'switch_parent': False, - 'text': None}) + 'text': None, + 'git': opts.get('git')}) jumbo = [] msgs = [] @@ -322,6 +323,7 @@ ('', 'bcc', [], 'email addresses of blind copy recipients'), ('c', 'cc', [], 'email addresses of copy recipients'), ('d', 'diffstat', None, 'add diffstat output to messages'), + ('g', 'git', None, _('use git extended diff format')), ('f', 'from', '', 'email address of sender'), ('', 'plain', None, 'omit hg patch header'), ('n', 'test', None, 'print messages that would be sent'),
--- a/mercurial/commands.py Wed Aug 30 19:58:54 2006 +0200 +++ b/mercurial/commands.py Wed Aug 30 10:21:02 2006 -0700 @@ -2887,6 +2887,7 @@ (export, [('o', 'output', '', _('print output to file with formatted name')), ('a', 'text', None, _('treat all files as text')), + ('g', 'git', None, _('use git extended diff format')), ('', 'switch-parent', None, _('diff against the second parent'))], _('hg export [-a] [-o OUTFILESPEC] REV...')), "debugforget|forget":