scripts

commit 4894227017974e44de422de6c298e94ebb256b64
parent 86687b0279684be46dc51add7dbbc0ddcbfd2ac3
Author: sin <sin@2f30.org>
Date:   Mon, 21 Oct 2013 19:08:25 +0100

Default to a rebase instead of a merge

+x blackholedns

Diffstat:
M
blackholedns
 | 
0

M
git-update-all
 | 
2
+-

2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/blackholedns b/blackholedns
diff --git a/git-update-all b/git-update-all
@@ -6,7 +6,7 @@ for i in *; do
 		cd "$i"
 		echo "Updating $i..."
 		git remote update
-		git pull
+		git pull --rebase
 		cd - >/dev/null
 	else
 		echo "Skipping $i... not a git repo" 1>&2