diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-28 23:15:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-06 21:53:11 -0800 |
| commit | 8389b52b2a51d5b110b508cc67f0f41f99c30d3f (patch) | |
| tree | 5c0d4f548ab3e3719e64bb6087c5fbc46cf4f857 /Documentation/git.txt | |
| parent | 1cb303872ab1ba73fcc52167c61fc4211c843cf5 (diff) | |
| download | git-8389b52b2a51d5b110b508cc67f0f41f99c30d3f.tar.gz git-8389b52b2a51d5b110b508cc67f0f41f99c30d3f.tar.xz | |
git-rerere: reuse recorded resolve.
In a workflow that employs relatively long lived topic branches,
the developer sometimes needs to resolve the same conflict over
and over again until the topic branches are done (either merged
to the "release" branch, or sent out and accepted upstream).
This commit introduces a new command, "git rerere", to help this
process by recording the conflicted automerge results and
corresponding hand-resolve results on the initial manual merge,
and later by noticing the same conflicted automerge and applying
the previously recorded hand resolution using three-way merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index e8ef3efa8..2d0ca9d8e 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -313,6 +313,9 @@ gitlink:git-rebase[1]:: gitlink:git-repack[1]:: Pack unpacked objects in a repository. +gitlink:git-rerere[1]:: + Reuse recorded resolution of conflicted merges. + gitlink:git-reset[1]:: Reset current HEAD to the specified state. |