equal
deleted
inserted
replaced
26 |
26 |
27 pick c561b4e977df Add beta |
27 pick c561b4e977df Add beta |
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 633536316234 and 7c2fd3b9020c |
31 # Edit history between c561b4e977df and 7c2fd3b9020c |
32 # |
32 # |
33 # Commands: |
33 # Commands: |
34 # p, pick = use commit |
34 # p, pick = use commit |
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 (combines N and N-1) |
36 # f, fold = use commit, but fold into previous commit (combines N and N-1) |
45 |
45 |
46 pick 030b686bedc4 Add gamma |
46 pick 030b686bedc4 Add gamma |
47 pick c561b4e977df Add beta |
47 pick c561b4e977df Add beta |
48 fold 7c2fd3b9020c Add delta |
48 fold 7c2fd3b9020c Add delta |
49 |
49 |
50 # Edit history between 633536316234 and 7c2fd3b9020c |
50 # Edit history between c561b4e977df and 7c2fd3b9020c |
51 # |
51 # |
52 # Commands: |
52 # Commands: |
53 # p, pick = use commit |
53 # p, pick = use commit |
54 # e, edit = use commit, but stop for amending |
54 # e, edit = use commit, but stop for amending |
55 # f, fold = use commit, but fold into previous commit (combines N and N-1) |
55 # f, fold = use commit, but fold into previous commit (combines N and N-1) |
106 much work it will be to rearrange history, or that you made a mistake, |
106 much work it will be to rearrange history, or that you made a mistake, |
107 you can use ``hg histedit --abort`` to abandon the new changes you |
107 you can use ``hg histedit --abort`` to abandon the new changes you |
108 have made and return to the state before you attempted to edit your |
108 have made and return to the state before you attempted to edit your |
109 history. |
109 history. |
110 |
110 |
111 If we clone the example repository above and add three more changes, such that |
111 If we clone the histedit-ed example repository above and add four more |
112 we have the following history:: |
112 changes, such that we have the following history:: |
113 |
113 |
114 @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan |
114 @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan |
115 | Add theta |
115 | Add theta |
116 | |
116 | |
117 o 5 140988835471 2009-04-27 18:04 -0500 stefan |
117 o 5 140988835471 2009-04-27 18:04 -0500 stefan |