diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-09-27 20:27:43 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-09-27 20:27:43 -0700 |
| commit | 3185fe4edea62dd3fa9818cf80902e96fe2a2d21 (patch) | |
| tree | 824a6cdb4b8ccc163127e00e1e86435b4c523476 /bin/231commit | |
| parent | f50a821d306b561d602edbdac0dac958b862ec0c (diff) | |
| parent | 39533c66139210655fc47404a17fd4e9b9ca8a00 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts:
FS/FS/cust_main/Billing.pm
Diffstat (limited to 'bin/231commit')
| -rwxr-xr-x | bin/231commit | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/231commit b/bin/231commit index ca28ede1e..6d09863ca 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 ) ", - " && git diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch ) ", + "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p1 ) ", + " && git diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch -p1 ) ", " && ( ( 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) )" |