equal
deleted
inserted
replaced
33 # Commits are listed from least to most recent |
33 # Commits are listed from least to most recent |
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 stop for amending |
38 # f, fold = use commit, but fold into previous commit (combines this commit with the one above) |
38 # f, fold = use commit, but combine it with the one above |
39 # d, drop = remove commit from history |
39 # d, drop = remove commit from history |
40 # m, mess = edit message without changing commit content |
40 # m, mess = edit message without changing commit content |
41 # |
41 # |
42 |
42 |
43 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 |
54 # Commits are listed from least to most recent |
54 # Commits are listed from least to most recent |
55 # |
55 # |
56 # Commands: |
56 # Commands: |
57 # p, pick = use commit |
57 # p, pick = use commit |
58 # e, edit = use commit, but stop for amending |
58 # e, edit = use commit, but stop for amending |
59 # f, fold = use commit, but fold into previous commit (combines this commit with the one above) |
59 # f, fold = use commit, but combine it with the one above |
60 # d, drop = remove commit from history |
60 # d, drop = remove commit from history |
61 # m, mess = edit message without changing commit content |
61 # m, mess = edit message without changing commit content |
62 # |
62 # |
63 |
63 |
64 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 |
177 # Commits are listed from least to most recent |
177 # Commits are listed from least to most recent |
178 # |
178 # |
179 # Commands: |
179 # Commands: |
180 # p, pick = use commit |
180 # p, pick = use commit |
181 # e, edit = use commit, but stop for amending |
181 # e, edit = use commit, but stop for amending |
182 # f, fold = use commit, but fold into previous commit (combines this commit with the one above) |
182 # f, fold = use commit, but combine it with the one above |
183 # d, drop = remove commit from history |
183 # d, drop = remove commit from history |
184 # m, mess = edit message without changing commit content |
184 # m, mess = edit message without changing commit content |
185 # |
185 # |
186 """) |
186 """) |
187 |
187 |