Updating gitsync scrupt.

Perry Werneck
1 parent 12b5429e
Showing 1 changed file with 11 additions and 3 deletions Show diff stats
gitsync.sh
@@ -15,10 +15,18 @@
 git push
  
 git fetch origin
-git checkout master
-git merge origin/master
+git merge
  
-for repo in $(git remote -v | grep -v origin | grep "(push)" | awk '{print $1}')
+REPOS=$(git remote -v | grep -v origin | grep "(push)" | awk '{print $1}')
+
+for repo in ${REPOS}
+do
+	echo "Getting updates from ${repo} ..."
+	git fetch ${repo}
+	git merge
+done
+
+for repo in ${REPOS}
 do
 	echo "Updating ${repo} ..."
 	git push ${repo}
...	...	@@ -15,10 +15,18 @@
15	15	git push
16	16
17	17	git fetch origin
18		-git checkout master
19		-git merge origin/master
	18	+git merge
20	19
21		-for repo in $(git remote -v \| grep -v origin \| grep "(push)" \| awk '{print $1}')
	20	+REPOS=$(git remote -v \| grep -v origin \| grep "(push)" \| awk '{print $1}')
	21	+
	22	+for repo in ${REPOS}
	23	+do
	24	+ echo "Getting updates from ${repo} ..."
	25	+ git fetch ${repo}
	26	+ git merge
	27	+done
	28	+
	29	+for repo in ${REPOS}
22	30	do
23	31	echo "Updating ${repo} ..."
24	32	git push ${repo}
...	...