##// END OF EJS Templates
histedit: adjust comment describing `edit` action for clarity...
Augie Fackler -
r46720:6f8a94bb default
parent child Browse files
Show More
@@ -34,7 +34,7 b' file open in your editor::'
34 #
34 #
35 # Commands:
35 # Commands:
36 # p, pick = use commit
36 # p, pick = use commit
37 # e, edit = use commit, but stop for amending
37 # e, edit = use commit, but allow edits before making new commit
38 # f, fold = use commit, but combine it with the one above
38 # f, fold = use commit, but combine it with the one above
39 # r, roll = like fold, but discard this commit's description and date
39 # r, roll = like fold, but discard this commit's description and date
40 # d, drop = remove commit from history
40 # d, drop = remove commit from history
@@ -57,7 +57,7 b' would reorganize the file to look like t'
57 #
57 #
58 # Commands:
58 # Commands:
59 # p, pick = use commit
59 # p, pick = use commit
60 # e, edit = use commit, but stop for amending
60 # e, edit = use commit, but allow edits before making new commit
61 # f, fold = use commit, but combine it with the one above
61 # f, fold = use commit, but combine it with the one above
62 # r, roll = like fold, but discard this commit's description and date
62 # r, roll = like fold, but discard this commit's description and date
63 # d, drop = remove commit from history
63 # d, drop = remove commit from history
@@ -792,7 +792,7 b' class pick(histeditaction):'
792 return super(pick, self).run()
792 return super(pick, self).run()
793
793
794
794
795 @action([b'edit', b'e'], _(b'use commit, but stop for amending'), priority=True)
795 @action([b'edit', b'e'], _(b'use commit, but allow edits before making new commit'), priority=True)
796 class edit(histeditaction):
796 class edit(histeditaction):
797 def run(self):
797 def run(self):
798 repo = self.repo
798 repo = self.repo
@@ -77,7 +77,7 b' Run a dummy edit to make sure we get tip'
77 #
77 #
78 # Commands:
78 # Commands:
79 #
79 #
80 # e, edit = use commit, but stop for amending
80 # e, edit = use commit, but allow edits before making new commit
81 # m, mess = edit commit message without changing commit content
81 # m, mess = edit commit message without changing commit content
82 # p, pick = use commit
82 # p, pick = use commit
83 # b, base = checkout changeset and apply further changesets from there
83 # b, base = checkout changeset and apply further changesets from there
@@ -319,7 +319,7 b' Test that trimming description using mul'
319 #
319 #
320 # Commands:
320 # Commands:
321 #
321 #
322 # e, edit = use commit, but stop for amending
322 # e, edit = use commit, but allow edits before making new commit
323 # m, mess = edit commit message without changing commit content
323 # m, mess = edit commit message without changing commit content
324 # p, pick = use commit
324 # p, pick = use commit
325 # b, base = checkout changeset and apply further changesets from there
325 # b, base = checkout changeset and apply further changesets from there
@@ -557,7 +557,7 b" Check that 'roll' is selected by default"
557 #
557 #
558 # Commands:
558 # Commands:
559 #
559 #
560 # e, edit = use commit, but stop for amending
560 # e, edit = use commit, but allow edits before making new commit
561 # m, mess = edit commit message without changing commit content
561 # m, mess = edit commit message without changing commit content
562 # p, pick = use commit
562 # p, pick = use commit
563 # b, base = checkout changeset and apply further changesets from there
563 # b, base = checkout changeset and apply further changesets from there
@@ -73,7 +73,7 b''
73 #
73 #
74 # Commands:
74 # Commands:
75 #
75 #
76 # e, edit = use commit, but stop for amending
76 # e, edit = use commit, but allow edits before making new commit
77 # m, mess = edit commit message without changing commit content
77 # m, mess = edit commit message without changing commit content
78 # p, pick = use commit
78 # p, pick = use commit
79 # b, base = checkout changeset and apply further changesets from there
79 # b, base = checkout changeset and apply further changesets from there
@@ -130,7 +130,7 b''
130 #
130 #
131 # Commands:
131 # Commands:
132 #
132 #
133 # e, edit = use commit, but stop for amending
133 # e, edit = use commit, but allow edits before making new commit
134 # m, mess = edit commit message without changing commit content
134 # m, mess = edit commit message without changing commit content
135 # p, pick = use commit
135 # p, pick = use commit
136 # b, base = checkout changeset and apply further changesets from there
136 # b, base = checkout changeset and apply further changesets from there
@@ -68,7 +68,7 b' show the edit commands offered'
68 #
68 #
69 # Commands:
69 # Commands:
70 #
70 #
71 # e, edit = use commit, but stop for amending
71 # e, edit = use commit, but allow edits before making new commit
72 # m, mess = edit commit message without changing commit content
72 # m, mess = edit commit message without changing commit content
73 # p, pick = use commit
73 # p, pick = use commit
74 # b, base = checkout changeset and apply further changesets from there
74 # b, base = checkout changeset and apply further changesets from there
@@ -94,7 +94,7 b' test customization of revision summary'
94 #
94 #
95 # Commands:
95 # Commands:
96 #
96 #
97 # e, edit = use commit, but stop for amending
97 # e, edit = use commit, but allow edits before making new commit
98 # m, mess = edit commit message without changing commit content
98 # m, mess = edit commit message without changing commit content
99 # p, pick = use commit
99 # p, pick = use commit
100 # b, base = checkout changeset and apply further changesets from there
100 # b, base = checkout changeset and apply further changesets from there
@@ -120,7 +120,7 b" colors in the custom template don't show"
120 #
120 #
121 # Commands:
121 # Commands:
122 #
122 #
123 # e, edit = use commit, but stop for amending
123 # e, edit = use commit, but allow edits before making new commit
124 # m, mess = edit commit message without changing commit content
124 # m, mess = edit commit message without changing commit content
125 # p, pick = use commit
125 # p, pick = use commit
126 # b, base = checkout changeset and apply further changesets from there
126 # b, base = checkout changeset and apply further changesets from there
@@ -405,7 +405,7 b' Verify that revsetalias entries work wit'
405 #
405 #
406 # Commands:
406 # Commands:
407 #
407 #
408 # e, edit = use commit, but stop for amending
408 # e, edit = use commit, but allow edits before making new commit
409 # m, mess = edit commit message without changing commit content
409 # m, mess = edit commit message without changing commit content
410 # p, pick = use commit
410 # p, pick = use commit
411 # b, base = checkout changeset and apply further changesets from there
411 # b, base = checkout changeset and apply further changesets from there
@@ -475,7 +475,7 b' Attempting to fold a change into a publi'
475 #
475 #
476 # Commands:
476 # Commands:
477 #
477 #
478 # e, edit = use commit, but stop for amending
478 # e, edit = use commit, but allow edits before making new commit
479 # m, mess = edit commit message without changing commit content
479 # m, mess = edit commit message without changing commit content
480 # p, fold = use commit
480 # p, fold = use commit
481 # b, base = checkout changeset and apply further changesets from there
481 # b, base = checkout changeset and apply further changesets from there
@@ -139,7 +139,7 b' Base setup for the rest of the testing'
139 #
139 #
140 # Commands:
140 # Commands:
141 #
141 #
142 # e, edit = use commit, but stop for amending
142 # e, edit = use commit, but allow edits before making new commit
143 # m, mess = edit commit message without changing commit content
143 # m, mess = edit commit message without changing commit content
144 # p, pick = use commit
144 # p, pick = use commit
145 # b, base = checkout changeset and apply further changesets from there
145 # b, base = checkout changeset and apply further changesets from there
@@ -49,7 +49,7 b' show the edit commands offered by outgoi'
49 #
49 #
50 # Commands:
50 # Commands:
51 #
51 #
52 # e, edit = use commit, but stop for amending
52 # e, edit = use commit, but allow edits before making new commit
53 # m, mess = edit commit message without changing commit content
53 # m, mess = edit commit message without changing commit content
54 # p, pick = use commit
54 # p, pick = use commit
55 # b, base = checkout changeset and apply further changesets from there
55 # b, base = checkout changeset and apply further changesets from there
@@ -84,7 +84,7 b' show the error from unrelated repos'
84 #
84 #
85 # Commands:
85 # Commands:
86 #
86 #
87 # e, edit = use commit, but stop for amending
87 # e, edit = use commit, but allow edits before making new commit
88 # m, mess = edit commit message without changing commit content
88 # m, mess = edit commit message without changing commit content
89 # p, pick = use commit
89 # p, pick = use commit
90 # b, base = checkout changeset and apply further changesets from there
90 # b, base = checkout changeset and apply further changesets from there
@@ -111,7 +111,7 b' test sensitivity to branch in URL:'
111 #
111 #
112 # Commands:
112 # Commands:
113 #
113 #
114 # e, edit = use commit, but stop for amending
114 # e, edit = use commit, but allow edits before making new commit
115 # m, mess = edit commit message without changing commit content
115 # m, mess = edit commit message without changing commit content
116 # p, pick = use commit
116 # p, pick = use commit
117 # b, base = checkout changeset and apply further changesets from there
117 # b, base = checkout changeset and apply further changesets from there
General Comments 0
You need to be logged in to leave comments. Login now