Skip to content
Newer
Older
100644 217 lines (169 sloc) 7.29 KB
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
1 git-rerere(1)
2 =============
3
4 NAME
5 ----
7c73c66 Autogenerated HTML docs for v1.5.0-rc1-g72fe
Junio C Hamano authored Jan 19, 2007
6 git-rerere - Reuse recorded resolution of conflicted merges
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
7
8 SYNOPSIS
9 --------
15567bc Autogenerated HTML docs for v1.7.6-345-g5c2f8
Junio C Hamano authored Jul 23, 2011
10 [verse]
c55452a @gitster Autogenerated HTML docs for v1.7.10-rc1
authored Mar 14, 2012
11 'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
12
13 DESCRIPTION
14 -----------
15
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
16 In a workflow employing relatively long lived topic branches,
17 the developer sometimes needs to resolve the same conflicts over
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
18 and over again until the topic branches are done (either merged
19 to the "release" branch, or sent out and accepted upstream).
20
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
21 This command assists the developer in this process by recording
22 conflicted automerge results and corresponding hand resolve results
23 on the initial manual merge, and applying previously recorded
24 hand resolutions to their corresponding automerge results.
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
25
0e47b23 Autogenerated HTML docs for v1.5.4-rc3-11-g4e67
Junio C Hamano authored Jan 15, 2008
26 [NOTE]
543f8d6 Autogenerated HTML docs for v1.6.4
Junio C Hamano authored Jul 29, 2009
27 You need to set the configuration variable rerere.enabled in order to
0e47b23 Autogenerated HTML docs for v1.5.4-rc3-11-g4e67
Junio C Hamano authored Jan 15, 2008
28 enable this command.
29
e7935c4 Autogenerated HTML docs for v1.4.4.2-g1d77
Junio C Hamano authored Dec 13, 2006
30
31 COMMANDS
32 --------
33
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
34 Normally, 'git rerere' is run without arguments or user-intervention.
e7935c4 Autogenerated HTML docs for v1.4.4.2-g1d77
Junio C Hamano authored Dec 13, 2006
35 However, it has several commands that allow it to interact with
36 its working state.
37
38 'clear'::
39
c55452a @gitster Autogenerated HTML docs for v1.7.10-rc1
authored Mar 14, 2012
40 Reset the metadata used by rerere if a merge resolution is to be
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
41 aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
fce7c7e Autogenerated HTML docs for v1.5.6.1-156-ge903b
Junio C Hamano authored Jul 2, 2008
42 will automatically invoke this command.
e7935c4 Autogenerated HTML docs for v1.4.4.2-g1d77
Junio C Hamano authored Dec 13, 2006
43
3e3aa81 Autogenerated HTML docs for v1.7.2-rc1-7-g869d
Junio C Hamano authored Jul 5, 2010
44 'forget' <pathspec>::
45
c55452a @gitster Autogenerated HTML docs for v1.7.10-rc1
authored Mar 14, 2012
46 Reset the conflict resolutions which rerere has recorded for the current
d2c978f Autogenerated HTML docs for v1.7.4.1-343-ga91df
Junio C Hamano authored Mar 20, 2011
47 conflict in <pathspec>.
3e3aa81 Autogenerated HTML docs for v1.7.2-rc1-7-g869d
Junio C Hamano authored Jul 5, 2010
48
e7935c4 Autogenerated HTML docs for v1.4.4.2-g1d77
Junio C Hamano authored Dec 13, 2006
49 'diff'::
50
c55452a @gitster Autogenerated HTML docs for v1.7.10-rc1
authored Mar 14, 2012
51 Display diffs for the current state of the resolution. It is
e7935c4 Autogenerated HTML docs for v1.4.4.2-g1d77
Junio C Hamano authored Dec 13, 2006
52 useful for tracking what has changed while the user is resolving
53 conflicts. Additional arguments are passed directly to the system
ba4b928 Autogenerated HTML docs for v1.5.6.2-212-g08b5
Junio C Hamano authored Jul 6, 2008
54 'diff' command installed in PATH.
e7935c4 Autogenerated HTML docs for v1.4.4.2-g1d77
Junio C Hamano authored Dec 13, 2006
55
56 'status'::
57
c55452a @gitster Autogenerated HTML docs for v1.7.10-rc1
authored Mar 14, 2012
58 Print paths with conflicts whose merge resolution rerere will record.
59
60 'remaining'::
61
62 Print paths with conflicts that have not been autoresolved by rerere.
63 This includes paths whose resolutions cannot be tracked by rerere,
64 such as conflicting submodules.
e7935c4 Autogenerated HTML docs for v1.4.4.2-g1d77
Junio C Hamano authored Dec 13, 2006
65
66 'gc'::
67
c55452a @gitster Autogenerated HTML docs for v1.7.10-rc1
authored Mar 14, 2012
68 Prune records of conflicted merges that
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
69 occurred a long time ago. By default, unresolved conflicts older
70 than 15 days and resolved conflicts older than 60
71 days are pruned. These defaults are controlled via the
7464064 Autogenerated HTML docs for v1.5.0-rc0-g4aec
Junio C Hamano authored Dec 27, 2006
72 `gc.rerereunresolved` and `gc.rerereresolved` configuration
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
73 variables respectively.
e7935c4 Autogenerated HTML docs for v1.4.4.2-g1d77
Junio C Hamano authored Dec 13, 2006
74
75
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
76 DISCUSSION
77 ----------
78
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
79 When your topic branch modifies an overlapping area that your
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
80 master branch (or upstream) touched since your topic branch
81 forked from it, you may want to test it with the latest master,
82 even before your topic branch is ready to be pushed upstream:
83
84 ------------
85 o---*---o topic
86 /
87 o---o---o---*---o---o master
88 ------------
89
90 For such a test, you need to merge master and topic somehow.
91 One way to do it is to pull master into the topic branch:
92
93 ------------
94 $ git checkout topic
edd2b0a Autogenerated HTML docs for v1.5.0-rc1-g5fe3
Junio C Hamano authored Jan 15, 2007
95 $ git merge master
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
96
97 o---*---o---+ topic
98 / /
99 o---o---o---*---o---o master
100 ------------
101
102 The commits marked with `*` touch the same area in the same
103 file; you need to resolve the conflicts when creating the commit
b76a686 @gitster Autogenerated HTML docs for v1.7.10.1-433-g34875
authored May 2, 2012
104 marked with `+`. Then you can test the result to make sure your
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
105 work-in-progress still works with what is in the latest master.
106
107 After this test merge, there are two ways to continue your work
108 on the topic. The easiest is to build on top of the test merge
b76a686 @gitster Autogenerated HTML docs for v1.7.10.1-433-g34875
authored May 2, 2012
109 commit `+`, and when your work in the topic branch is finally
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
110 ready, pull the topic branch into master, and/or ask the
111 upstream to pull from you. By that time, however, the master or
b76a686 @gitster Autogenerated HTML docs for v1.7.10.1-433-g34875
authored May 2, 2012
112 the upstream might have been advanced since the test merge `+`,
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
113 in which case the final commit graph would look like this:
114
115 ------------
116 $ git checkout topic
edd2b0a Autogenerated HTML docs for v1.5.0-rc1-g5fe3
Junio C Hamano authored Jan 15, 2007
117 $ git merge master
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
118 $ ... work on both topic and master branches
119 $ git checkout master
edd2b0a Autogenerated HTML docs for v1.5.0-rc1-g5fe3
Junio C Hamano authored Jan 15, 2007
120 $ git merge topic
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
121
122 o---*---o---+---o---o topic
123 / / \
124 o---o---o---*---o---o---o---o---+ master
125 ------------
126
127 When your topic branch is long-lived, however, your topic branch
128 would end up having many such "Merge from master" commits on it,
129 which would unnecessarily clutter the development history.
130 Readers of the Linux kernel mailing list may remember that Linus
131 complained about such too frequent test merges when a subsystem
132 maintainer asked to pull from a branch full of "useless merges".
133
134 As an alternative, to keep the topic branch clean of test
135 merges, you could blow away the test merge, and keep building on
136 top of the tip before the test merge:
137
138 ------------
139 $ git checkout topic
edd2b0a Autogenerated HTML docs for v1.5.0-rc1-g5fe3
Junio C Hamano authored Jan 15, 2007
140 $ git merge master
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
141 $ git reset --hard HEAD^ ;# rewind the test merge
142 $ ... work on both topic and master branches
143 $ git checkout master
edd2b0a Autogenerated HTML docs for v1.5.0-rc1-g5fe3
Junio C Hamano authored Jan 15, 2007
144 $ git merge topic
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
145
146 o---*---o-------o---o topic
147 / \
148 o---o---o---*---o---o---o---o---+ master
149 ------------
150
151 This would leave only one merge commit when your topic branch is
152 finally ready and merged into the master branch. This merge
153 would require you to resolve the conflict, introduced by the
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
154 commits marked with `*`. However, this conflict is often the
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
155 same conflict you resolved when you created the test merge you
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
156 blew away. 'git rerere' helps you resolve this final
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
157 conflicted merge using the information from your earlier hand
158 resolve.
159
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
160 Running the 'git rerere' command immediately after a conflicted
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
161 automerge records the conflicted working tree files, with the
162 usual conflict markers `<<<<<<<`, `=======`, and `>>>>>>>` in
163 them. Later, after you are done resolving the conflicts,
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
164 running 'git rerere' again will record the resolved state of these
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
165 files. Suppose you did this when you created the test merge of
166 master into the topic branch.
167
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
168 Next time, after seeing the same conflicted automerge,
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
169 running 'git rerere' will perform a three-way merge between the
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
170 earlier conflicted automerge, the earlier manual resolution, and
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
171 the current conflicted automerge.
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
172 If this three-way merge resolves cleanly, the result is written
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
173 out to your working tree file, so you do not have to manually
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
174 resolve it. Note that 'git rerere' leaves the index file alone,
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
175 so you still need to do the final sanity checks with `git diff`
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
176 (or `git diff -c`) and 'git add' when you are satisfied.
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
177
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
178 As a convenience measure, 'git merge' automatically invokes
179 'git rerere' upon exiting with a failed automerge and 'git rerere'
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
180 records the hand resolve when it is a new conflict, or reuses the earlier hand
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
181 resolve when it is not. 'git commit' also invokes 'git rerere'
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
182 when committing a merge result. What this means is that you do
183 not have to do anything special yourself (besides enabling
184 the rerere.enabled config variable).
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
185
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
186 In our example, when you do the test merge, the manual
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
187 resolution is recorded, and it will be reused when you do the
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
188 actual merge later with the updated master and topic branch, as long
189 as the recorded resolution is still applicable.
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
190
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
191 The information 'git rerere' records is also used when running
192 'git rebase'. After blowing away the test merge and continuing
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
193 development on the topic branch:
194
195 ------------
196 o---*---o-------o---o topic
197 /
198 o---o---o---*---o---o---o---o master
199
200 $ git rebase master topic
201
202 o---*---o-------o---o topic
203 /
204 o---o---o---*---o---o---o---o master
205 ------------
206
25e7ba6 Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Junio C Hamano authored Jun 14, 2009
207 you could run `git rebase master topic`, to bring yourself
208 up-to-date before your topic is ready to be sent upstream.
209 This would result in falling back to a three-way merge, and it
210 would conflict the same way as the test merge you resolved earlier.
1aa40d2 Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Junio C Hamano authored Jan 21, 2010
211 'git rerere' will be run by 'git rebase' to help you resolve this
40f2f8d Autogenerated HTML docs for v1.1.6-g5a79
Junio C Hamano authored Feb 7, 2006
212 conflict.
213
214 GIT
215 ---
f7c042d Autogenerated HTML docs for v1.5.6-rc1-21-g03300
Junio C Hamano authored Jun 6, 2008
216 Part of the linkgit:git[1] suite
Something went wrong with that request. Please try again.