3821 ('D', 'currentdate', False, |
3821 ('D', 'currentdate', False, |
3822 _('record the current date as commit date')), |
3822 _('record the current date as commit date')), |
3823 ('U', 'currentuser', False, |
3823 ('U', 'currentuser', False, |
3824 _('record the current user as committer'), _('DATE'))] |
3824 _('record the current user as committer'), _('DATE'))] |
3825 + commitopts2 + mergetoolopts + dryrunopts, |
3825 + commitopts2 + mergetoolopts + dryrunopts, |
3826 _('[OPTION]... [-r] REV...')) |
3826 _('[OPTION]... [-r REV]... REV...')) |
3827 def graft(ui, repo, *revs, **opts): |
3827 def graft(ui, repo, *revs, **opts): |
3828 '''copy changes from other branches onto the current branch |
3828 '''copy changes from other branches onto the current branch |
3829 |
3829 |
3830 This command uses Mercurial's merge logic to copy individual |
3830 This command uses Mercurial's merge logic to copy individual |
3831 changes from other branches without merging branches in the |
3831 changes from other branches without merging branches in the |