From: Carl Fürstenberg <azatoth@gmail.com>
Date: Thu, 17 Mar 2011 18:50:53 +0000 (+0100)
Subject: Merge when updating submodules on make
X-Git-Tag: 1.5.2rc1~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F277%2Fhead;p=jquery.git

Merge when updating submodules on make

When  running make, the submodule update will remove all local changes.
Adding flag --rebase or --merge does solve the issue. rebase will
probably make it cleaner, but it might stop on conflict, thus --merge
will result in fewer (probably none).
---

diff --git a/Makefile b/Makefile
index 84816a19e..525d3a197 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
 init:
-	@@if [ -d .git ]; then git submodule update --init --recursive; fi
+	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
 
 jquery: init ${JQ}
 jq: init ${JQ}