35 # e, edit = use commit, but stop for amending |
35 # e, edit = use commit, but stop for amending |
36 # f, fold = use commit, but fold into previous commit |
36 # f, fold = use commit, but fold into previous commit |
37 # d, drop = remove commit from history |
37 # d, drop = remove commit from history |
38 # m, mess = edit message without changing commit content |
38 # m, mess = edit message without changing commit content |
39 # |
39 # |
40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
41 |
40 |
42 In this file, lines beginning with ``#`` are ignored. You must specify a rule |
41 In this file, lines beginning with ``#`` are ignored. You must specify a rule |
43 for each revision in your history. For example, if you had meant to add gamma |
42 for each revision in your history. For example, if you had meant to add gamma |
44 before beta, and then wanted to add delta in the same revision as beta, you |
43 before beta, and then wanted to add delta in the same revision as beta, you |
45 would reorganize the file to look like this:: |
44 would reorganize the file to look like this:: |
55 # e, edit = use commit, but stop for amending |
54 # e, edit = use commit, but stop for amending |
56 # f, fold = use commit, but fold into previous commit |
55 # f, fold = use commit, but fold into previous commit |
57 # d, drop = remove commit from history |
56 # d, drop = remove commit from history |
58 # m, mess = edit message without changing commit content |
57 # m, mess = edit message without changing commit content |
59 # |
58 # |
60 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 |
59 |
62 At which point you close the editor and ``histedit`` starts working. When you |
60 At which point you close the editor and ``histedit`` starts working. When you |
63 specify a ``fold`` operation, ``histedit`` will open an editor when it folds |
61 specify a ``fold`` operation, ``histedit`` will open an editor when it folds |
64 those revisions together, offering you a chance to clean up the commit message:: |
62 those revisions together, offering you a chance to clean up the commit message:: |
65 |
63 |