]> scripts.mit.edu Git - wizard.git/commitdiff
Utility scripts for mass-upgrading.
authorEdward Z. Yang <ezyang@mit.edu>
Sat, 6 Feb 2010 23:51:26 +0000 (18:51 -0500)
committerEdward Z. Yang <ezyang@mit.edu>
Sat, 6 Feb 2010 23:51:26 +0000 (18:51 -0500)
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
bin/gco [new file with mode: 0755]
bin/gct [new file with mode: 0755]
bin/gdo [new file with mode: 0755]

diff --git a/bin/gco b/bin/gco
new file mode 100755 (executable)
index 0000000..e8d5842
--- /dev/null
+++ b/bin/gco
@@ -0,0 +1,4 @@
+#!/bin/sh
+git checkout --ours "$1"
+chmod 0777 "$1"
+git add "$1"
diff --git a/bin/gct b/bin/gct
new file mode 100755 (executable)
index 0000000..bdc2ca8
--- /dev/null
+++ b/bin/gct
@@ -0,0 +1,4 @@
+#!/bin/sh
+git checkout --theirs "$1"
+chmod 0777 "$1"
+git add "$1"
diff --git a/bin/gdo b/bin/gdo
new file mode 100755 (executable)
index 0000000..1d87b2f
--- /dev/null
+++ b/bin/gdo
@@ -0,0 +1,2 @@
+#!/bin/sh
+git diff ":1:$1" ":2:$1"