summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2012-03-06 13:12:24 -0800
committerIvan Kohler <ivan@freeside.biz>2012-03-06 13:12:24 -0800
commit19eb5bfe24e9748fecb06f8d428ab4eb6791e195 (patch)
tree1f0eaa814e93b279fa74965de6cd72f68384755f /bin
parent9c8370e960bea77063028ce488fde8b6bb47b53c (diff)
uuh, seems to be working for me without -p?
Diffstat (limited to 'bin')
-rwxr-xr-xbin/231commit4
-rwxr-xr-xbin/23commit4
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/231commit b/bin/231commit
index fa031b5d6..ca28ede1e 100755
--- a/bin/231commit
+++ b/bin/231commit
@@ -20,8 +20,8 @@ die "no files!" unless @ARGV;
system join('',
"( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
"( cd /home/$USER/freeside2.1/$prefix; git pull ) && ",
- "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
- " && git diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch -p0 ) ",
+ "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch ) ",
+ " && git diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch ) ",
" && ( ( git commit -m $desc @ARGV && git push); ",
"( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push); ",
"( cd /home/$USER/freeside2.1/$prefix; git commit -m $desc @ARGV && git push) )"
diff --git a/bin/23commit b/bin/23commit
index 3416925d7..b7b0c1e57 100755
--- a/bin/23commit
+++ b/bin/23commit
@@ -19,8 +19,8 @@ die "no files!" unless @ARGV;
#print <<END;
system join('',
"( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
- "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
- " && ( ( git commit -m $desc @ARGV && git push ); ",
+ "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch ) ",
+ " && ( ( git pull && git commit -m $desc @ARGV && git push ); ",
"( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push ) )"
);