summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-29 07:15:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-07 05:53:11 (GMT)
commit8389b52b2a51d5b110b508cc67f0f41f99c30d3f (patch)
tree5c0d4f548ab3e3719e64bb6087c5fbc46cf4f857 /Makefile
parent1cb303872ab1ba73fcc52167c61fc4211c843cf5 (diff)
downloadgit-8389b52b2a51d5b110b508cc67f0f41f99c30d3f.zip
git-8389b52b2a51d5b110b508cc67f0f41f99c30d3f.tar.gz
git-8389b52b2a51d5b110b508cc67f0f41f99c30d3f.tar.bz2
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 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index dfd7651..5c32934 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ SCRIPT_SH = \
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \
- git-shortlog.perl git-fmt-merge-msg.perl \
+ git-shortlog.perl git-fmt-merge-msg.perl git-rerere.perl \
git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
SCRIPT_PYTHON = \