##// END OF EJS Templates
histedit: clarify description of fold command...
Adrian Zgorzałek -
r20503:23dc7787 default
parent child Browse files
Show More
@@ -30,10 +30,12 b' file open in your editor::'
30 30
31 31 # Edit history between c561b4e977df and 7c2fd3b9020c
32 32 #
33 # Commits are listed from least to most recent
34 #
33 35 # Commands:
34 36 # p, pick = use commit
35 37 # e, edit = use commit, but stop for amending
36 # f, fold = use commit, but fold into previous commit (combines N and N-1)
38 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
37 39 # d, drop = remove commit from history
38 40 # m, mess = edit message without changing commit content
39 41 #
@@ -49,10 +51,12 b' would reorganize the file to look like t'
49 51
50 52 # Edit history between c561b4e977df and 7c2fd3b9020c
51 53 #
54 # Commits are listed from least to most recent
55 #
52 56 # Commands:
53 57 # p, pick = use commit
54 58 # e, edit = use commit, but stop for amending
55 # f, fold = use commit, but fold into previous commit (combines N and N-1)
59 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
56 60 # d, drop = remove commit from history
57 61 # m, mess = edit message without changing commit content
58 62 #
@@ -170,10 +174,12 b" testedwith = 'internal'"
170 174 # i18n: command names and abbreviations must remain untranslated
171 175 editcomment = _("""# Edit history between %s and %s
172 176 #
177 # Commits are listed from least to most recent
178 #
173 179 # Commands:
174 180 # p, pick = use commit
175 181 # e, edit = use commit, but stop for amending
176 # f, fold = use commit, but fold into previous commit (combines N and N-1)
182 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
177 183 # d, drop = remove commit from history
178 184 # m, mess = edit message without changing commit content
179 185 #
@@ -51,10 +51,12 b' Run a dummy edit to make sure we get tip'
51 51
52 52 # Edit history between eb57da33312f and 08d98a8350f3
53 53 #
54 # Commits are listed from least to most recent
55 #
54 56 # Commands:
55 57 # p, pick = use commit
56 58 # e, edit = use commit, but stop for amending
57 # f, fold = use commit, but fold into previous commit (combines N and N-1)
59 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
58 60 # d, drop = remove commit from history
59 61 # m, mess = edit message without changing commit content
60 62 #
@@ -67,10 +67,12 b''
67 67
68 68 # Edit history between d2ae7f538514 and 652413bf663e
69 69 #
70 # Commits are listed from least to most recent
71 #
70 72 # Commands:
71 73 # p, pick = use commit
72 74 # e, edit = use commit, but stop for amending
73 # f, fold = use commit, but fold into previous commit (combines N and N-1)
75 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
74 76 # d, drop = remove commit from history
75 77 # m, mess = edit message without changing commit content
76 78 #
@@ -125,10 +127,12 b''
125 127
126 128 # Edit history between b346ab9a313d and cacdfd884a93
127 129 #
130 # Commits are listed from least to most recent
131 #
128 132 # Commands:
129 133 # p, pick = use commit
130 134 # e, edit = use commit, but stop for amending
131 # f, fold = use commit, but fold into previous commit (combines N and N-1)
135 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
132 136 # d, drop = remove commit from history
133 137 # m, mess = edit message without changing commit content
134 138 #
@@ -61,10 +61,12 b' show the edit commands offered'
61 61
62 62 # Edit history between 177f92b77385 and 652413bf663e
63 63 #
64 # Commits are listed from least to most recent
65 #
64 66 # Commands:
65 67 # p, pick = use commit
66 68 # e, edit = use commit, but stop for amending
67 # f, fold = use commit, but fold into previous commit (combines N and N-1)
69 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
68 70 # d, drop = remove commit from history
69 71 # m, mess = edit message without changing commit content
70 72 #
@@ -51,10 +51,12 b' Enable obsolete'
51 51
52 52 # Edit history between d2ae7f538514 and 652413bf663e
53 53 #
54 # Commits are listed from least to most recent
55 #
54 56 # Commands:
55 57 # p, pick = use commit
56 58 # e, edit = use commit, but stop for amending
57 # f, fold = use commit, but fold into previous commit (combines N and N-1)
59 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
58 60 # d, drop = remove commit from history
59 61 # m, mess = edit message without changing commit content
60 62 #
@@ -43,10 +43,12 b' show the edit commands offered by outgoi'
43 43
44 44 # Edit history between 055a42cdd887 and 652413bf663e
45 45 #
46 # Commits are listed from least to most recent
47 #
46 48 # Commands:
47 49 # p, pick = use commit
48 50 # e, edit = use commit, but stop for amending
49 # f, fold = use commit, but fold into previous commit (combines N and N-1)
51 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
50 52 # d, drop = remove commit from history
51 53 # m, mess = edit message without changing commit content
52 54 #
@@ -72,10 +74,12 b' show the error from unrelated repos'
72 74
73 75 # Edit history between 2a4042b45417 and 51281e65ba79
74 76 #
77 # Commits are listed from least to most recent
78 #
75 79 # Commands:
76 80 # p, pick = use commit
77 81 # e, edit = use commit, but stop for amending
78 # f, fold = use commit, but fold into previous commit (combines N and N-1)
82 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
79 83 # d, drop = remove commit from history
80 84 # m, mess = edit message without changing commit content
81 85 #
@@ -93,10 +97,12 b' test sensitivity to branch in URL:'
93 97
94 98 # Edit history between f26599ee3441 and f26599ee3441
95 99 #
100 # Commits are listed from least to most recent
101 #
96 102 # Commands:
97 103 # p, pick = use commit
98 104 # e, edit = use commit, but stop for amending
99 # f, fold = use commit, but fold into previous commit (combines N and N-1)
105 # f, fold = use commit, but fold into previous commit (combines this commit with the one above)
100 106 # d, drop = remove commit from history
101 107 # m, mess = edit message without changing commit content
102 108 #
General Comments 0
You need to be logged in to leave comments. Login now