summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-20 09:58:42 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-24 23:50:51 (GMT)
commitd9f3be7e2e4c9b402bbe6ee6e2b39b2ee89132cf (patch)
treed934f14ce5b8abe53432a9fa8ca90d78d4c9da9d /Makefile
parente0bfc81e05e57679916ab070c8fb2525f24771d4 (diff)
downloadgit-d9f3be7e2e4c9b402bbe6ee6e2b39b2ee89132cf.zip
git-d9f3be7e2e4c9b402bbe6ee6e2b39b2ee89132cf.tar.gz
git-d9f3be7e2e4c9b402bbe6ee6e2b39b2ee89132cf.tar.bz2
[PATCH] Infamous 'octopus merge'
This script uses the list of heads and their origin multi-head "git fetch" left in the $GIT_DIR/FETCH_HEAD file, and makes an octopus merge on top of the current HEAD using them. The implementation tries to be strict for the sake of safety. It insists that your working tree is clean (no local changes) and matches the HEAD, and when any of the merged heads does not automerge, the whole process is aborted and tries to rewind your working tree is to the original state. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 267de67..4d1c111 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
SCRIPTS += git-count-objects-script
# SCRIPTS += git-send-email-script
SCRIPTS += git-revert-script
+SCRIPTS += git-octopus-script
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-read-tree git-commit-tree git-cat-file git-fsck-cache \