67 # p, pick = use commit |
67 # p, pick = use commit |
68 # e, edit = use commit, but stop for amending |
68 # e, edit = use commit, but stop for amending |
69 # f, fold = use commit, but combine it with the one above |
69 # f, fold = use commit, but combine it with the one above |
70 # r, roll = like fold, but discard this commit's description |
70 # r, roll = like fold, but discard this commit's description |
71 # d, drop = remove commit from history |
71 # d, drop = remove commit from history |
72 # m, mess = edit message without changing commit content |
72 # m, mess = edit commit message without changing commit content |
73 # |
73 # |
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 |
75 |
76 edit the history |
76 edit the history |
77 (use a hacky editor to check histedit-last-edit.txt backup) |
77 (use a hacky editor to check histedit-last-edit.txt backup) |
345 # p, pick = use commit |
345 # p, pick = use commit |
346 # e, edit = use commit, but stop for amending |
346 # e, edit = use commit, but stop for amending |
347 # f, fold = use commit, but combine it with the one above |
347 # f, fold = use commit, but combine it with the one above |
348 # r, roll = like fold, but discard this commit's description |
348 # r, roll = like fold, but discard this commit's description |
349 # d, drop = remove commit from history |
349 # d, drop = remove commit from history |
350 # m, mess = edit message without changing commit content |
350 # m, mess = edit commit message without changing commit content |
351 # |
351 # |
352 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
352 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
353 |
353 |
354 should also work if a commit message is missing |
354 should also work if a commit message is missing |
355 $ BUNDLE="$TESTDIR/missing-comment.hg" |
355 $ BUNDLE="$TESTDIR/missing-comment.hg" |