41 pick e860deea161a 4 e |
41 pick e860deea161a 4 e |
42 pick 652413bf663e 5 f |
42 pick 652413bf663e 5 f |
43 |
43 |
44 # Edit history between 055a42cdd887 and 652413bf663e |
44 # Edit history between 055a42cdd887 and 652413bf663e |
45 # |
45 # |
|
46 # Commits are listed from least to most recent |
|
47 # |
46 # Commands: |
48 # Commands: |
47 # p, pick = use commit |
49 # p, pick = use commit |
48 # e, edit = use commit, but stop for amending |
50 # e, edit = use commit, but stop for amending |
49 # f, fold = use commit, but fold into previous commit (combines N and N-1) |
51 # f, fold = use commit, but fold into previous commit (combines this commit with the one above) |
50 # d, drop = remove commit from history |
52 # d, drop = remove commit from history |
51 # m, mess = edit message without changing commit content |
53 # m, mess = edit message without changing commit content |
52 # |
54 # |
53 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
55 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54 $ cd .. |
56 $ cd .. |
70 pick 68c46b4927ce 1 h |
72 pick 68c46b4927ce 1 h |
71 pick 51281e65ba79 2 i |
73 pick 51281e65ba79 2 i |
72 |
74 |
73 # Edit history between 2a4042b45417 and 51281e65ba79 |
75 # Edit history between 2a4042b45417 and 51281e65ba79 |
74 # |
76 # |
|
77 # Commits are listed from least to most recent |
|
78 # |
75 # Commands: |
79 # Commands: |
76 # p, pick = use commit |
80 # p, pick = use commit |
77 # e, edit = use commit, but stop for amending |
81 # e, edit = use commit, but stop for amending |
78 # f, fold = use commit, but fold into previous commit (combines N and N-1) |
82 # f, fold = use commit, but fold into previous commit (combines this commit with the one above) |
79 # d, drop = remove commit from history |
83 # d, drop = remove commit from history |
80 # m, mess = edit message without changing commit content |
84 # m, mess = edit message without changing commit content |
81 # |
85 # |
82 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 $ cd .. |
87 $ cd .. |
91 $ HGEDITOR=cat hg histedit --outgoing '../r#foo' | grep -v comparing | grep -v searching |
95 $ HGEDITOR=cat hg histedit --outgoing '../r#foo' | grep -v comparing | grep -v searching |
92 pick f26599ee3441 6 create foo branch |
96 pick f26599ee3441 6 create foo branch |
93 |
97 |
94 # Edit history between f26599ee3441 and f26599ee3441 |
98 # Edit history between f26599ee3441 and f26599ee3441 |
95 # |
99 # |
|
100 # Commits are listed from least to most recent |
|
101 # |
96 # Commands: |
102 # Commands: |
97 # p, pick = use commit |
103 # p, pick = use commit |
98 # e, edit = use commit, but stop for amending |
104 # e, edit = use commit, but stop for amending |
99 # f, fold = use commit, but fold into previous commit (combines N and N-1) |
105 # f, fold = use commit, but fold into previous commit (combines this commit with the one above) |
100 # d, drop = remove commit from history |
106 # d, drop = remove commit from history |
101 # m, mess = edit message without changing commit content |
107 # m, mess = edit message without changing commit content |
102 # |
108 # |
103 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
109 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
104 |
110 |