Show More
@@ -2975,7 +2975,7 def forget(ui, repo, *pats, **opts): | |||
|
2975 | 2975 | b'', |
|
2976 | 2976 | b'to', |
|
2977 | 2977 | b'', |
|
2978 |
_(b'graft to this destination, in |
|
|
2978 | _(b'graft to this destination, in-memory (EXPERIMENTAL)'), | |
|
2979 | 2979 | ), |
|
2980 | 2980 | (b'c', b'continue', False, _(b'resume interrupted graft')), |
|
2981 | 2981 | (b'', b'stop', False, _(b'stop interrupted graft')), |
@@ -3067,13 +3067,13 def graft(ui, repo, *revs, **opts): | |||
|
3067 | 3067 | |
|
3068 | 3068 | .. container:: verbose |
|
3069 | 3069 | |
|
3070 |
The experimental --to option allow |
|
|
3071 |
independent |
|
|
3072 | supported and the operation will be aborted if the configured tool | |
|
3073 | cannot handle the conflict that might be encountered. | |
|
3074 | ||
|
3075 |
As the operation is performe |
|
|
3076 | modified and some hooks might not be run. | |
|
3070 | The experimental --to option allows grafting a revision in-memory, | |
|
3071 | independent of the working copy. Merge conflicts are not currently | |
|
3072 | supported, and the operation will be aborted if the configured tool | |
|
3073 | cannot handle the conflicts that might be encountered. | |
|
3074 | ||
|
3075 | As the operation is performed in-memory, the on-disk files will not be | |
|
3076 | modified, and some hooks might not be run. | |
|
3077 | 3077 | |
|
3078 | 3078 | .. container:: verbose |
|
3079 | 3079 |
General Comments 0
You need to be logged in to leave comments.
Login now