Show More
@@ -986,7 +986,7 b' def absorb(ui, repo, stack=None, targetc' | |||||
986 | [('a', 'apply-changes', None, |
|
986 | [('a', 'apply-changes', None, | |
987 | _('apply changes without prompting for confirmation')), |
|
987 | _('apply changes without prompting for confirmation')), | |
988 | ('p', 'print-changes', None, |
|
988 | ('p', 'print-changes', None, | |
989 |
_(' |
|
989 | _('always print which changesets are modified by which changes')), | |
990 | ('i', 'interactive', None, |
|
990 | ('i', 'interactive', None, | |
991 | _('interactively select which chunks to apply (EXPERIMENTAL)')), |
|
991 | _('interactively select which chunks to apply (EXPERIMENTAL)')), | |
992 | ('e', 'edit-lines', None, |
|
992 | ('e', 'edit-lines', None, | |
@@ -1011,8 +1011,10 b' def absorbcmd(ui, repo, *pats, **opts):' | |||||
1011 |
|
1011 | |||
1012 | Changesets that become empty after applying the changes will be deleted. |
|
1012 | Changesets that become empty after applying the changes will be deleted. | |
1013 |
|
1013 | |||
1014 | If in doubt, run :hg:`absorb -pn` to preview what changesets will |
|
1014 | By default, absorb will show what it plans to do and prompt for | |
1015 | be amended by what changed lines, without actually changing anything. |
|
1015 | confirmation. If you are confident that the changes will be absorbed | |
|
1016 | to the correct place, run :hg:`absorb -a` to apply the changes | |||
|
1017 | immediately. | |||
1016 |
|
1018 | |||
1017 | Returns 0 on success, 1 if all chunks were ignored and nothing amended. |
|
1019 | Returns 0 on success, 1 if all chunks were ignored and nothing amended. | |
1018 | """ |
|
1020 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now