equal
deleted
inserted
replaced
28 pick 030b686bedc4 Add gamma |
28 pick 030b686bedc4 Add gamma |
29 pick 7c2fd3b9020c Add delta |
29 pick 7c2fd3b9020c Add delta |
30 |
30 |
31 # Edit history between c561b4e977df and 7c2fd3b9020c |
31 # Edit history between c561b4e977df and 7c2fd3b9020c |
32 # |
32 # |
|
33 # Commits are listed from least to most recent |
|
34 # |
33 # Commands: |
35 # Commands: |
34 # p, pick = use commit |
36 # p, pick = use commit |
35 # e, edit = use commit, but stop for amending |
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 # d, drop = remove commit from history |
39 # d, drop = remove commit from history |
38 # m, mess = edit message without changing commit content |
40 # m, mess = edit message without changing commit content |
39 # |
41 # |
40 |
42 |
41 In this file, lines beginning with ``#`` are ignored. You must specify a rule |
43 In this file, lines beginning with ``#`` are ignored. You must specify a rule |
47 pick c561b4e977df Add beta |
49 pick c561b4e977df Add beta |
48 fold 7c2fd3b9020c Add delta |
50 fold 7c2fd3b9020c Add delta |
49 |
51 |
50 # Edit history between c561b4e977df and 7c2fd3b9020c |
52 # Edit history between c561b4e977df and 7c2fd3b9020c |
51 # |
53 # |
|
54 # Commits are listed from least to most recent |
|
55 # |
52 # Commands: |
56 # Commands: |
53 # p, pick = use commit |
57 # p, pick = use commit |
54 # e, edit = use commit, but stop for amending |
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 # d, drop = remove commit from history |
60 # d, drop = remove commit from history |
57 # m, mess = edit message without changing commit content |
61 # m, mess = edit message without changing commit content |
58 # |
62 # |
59 |
63 |
60 At which point you close the editor and ``histedit`` starts working. When you |
64 At which point you close the editor and ``histedit`` starts working. When you |
168 testedwith = 'internal' |
172 testedwith = 'internal' |
169 |
173 |
170 # i18n: command names and abbreviations must remain untranslated |
174 # i18n: command names and abbreviations must remain untranslated |
171 editcomment = _("""# Edit history between %s and %s |
175 editcomment = _("""# Edit history between %s and %s |
172 # |
176 # |
|
177 # Commits are listed from least to most recent |
|
178 # |
173 # Commands: |
179 # Commands: |
174 # p, pick = use commit |
180 # p, pick = use commit |
175 # e, edit = use commit, but stop for amending |
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 # d, drop = remove commit from history |
183 # d, drop = remove commit from history |
178 # m, mess = edit message without changing commit content |
184 # m, mess = edit message without changing commit content |
179 # |
185 # |
180 """) |
186 """) |
181 |
187 |