68 # Edit history between d2ae7f538514 and 652413bf663e |
68 # Edit history between d2ae7f538514 and 652413bf663e |
69 # |
69 # |
70 # Commits are listed from least to most recent |
70 # Commits are listed from least to most recent |
71 # |
71 # |
72 # Commands: |
72 # Commands: |
|
73 # |
|
74 # e, edit = use commit, but stop for amending |
|
75 # m, mess = edit commit message without changing commit content |
73 # p, pick = use commit |
76 # p, pick = use commit |
74 # e, edit = use commit, but stop for amending |
77 # d, drop = remove commit from history |
75 # f, fold = use commit, but combine it with the one above |
78 # f, fold = use commit, but combine it with the one above |
76 # r, roll = like fold, but discard this commit's description |
79 # r, roll = like fold, but discard this commit's description |
77 # d, drop = remove commit from history |
|
78 # m, mess = edit commit message without changing commit content |
|
79 # |
80 # |
80 $ hg histedit 1 --commands - --verbose << EOF | grep histedit |
81 $ hg histedit 1 --commands - --verbose << EOF | grep histedit |
81 > pick 177f92b77385 2 c |
82 > pick 177f92b77385 2 c |
82 > drop d2ae7f538514 1 b |
83 > drop d2ae7f538514 1 b |
83 > pick 055a42cdd887 3 d |
84 > pick 055a42cdd887 3 d |
128 # Edit history between b346ab9a313d and cacdfd884a93 |
129 # Edit history between b346ab9a313d and cacdfd884a93 |
129 # |
130 # |
130 # Commits are listed from least to most recent |
131 # Commits are listed from least to most recent |
131 # |
132 # |
132 # Commands: |
133 # Commands: |
|
134 # |
|
135 # e, edit = use commit, but stop for amending |
|
136 # m, mess = edit commit message without changing commit content |
133 # p, pick = use commit |
137 # p, pick = use commit |
134 # e, edit = use commit, but stop for amending |
138 # d, drop = remove commit from history |
135 # f, fold = use commit, but combine it with the one above |
139 # f, fold = use commit, but combine it with the one above |
136 # r, roll = like fold, but discard this commit's description |
140 # r, roll = like fold, but discard this commit's description |
137 # d, drop = remove commit from history |
|
138 # m, mess = edit commit message without changing commit content |
|
139 # |
141 # |
140 $ hg histedit 1 --commands - --verbose << EOF | grep histedit |
142 $ hg histedit 1 --commands - --verbose << EOF | grep histedit |
141 > pick b346ab9a313d 1 c |
143 > pick b346ab9a313d 1 c |
142 > pick cacdfd884a93 3 f |
144 > pick cacdfd884a93 3 f |
143 > pick 59d9f330561f 2 d |
145 > pick 59d9f330561f 2 d |