diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-07-08 22:45:58 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-07-08 22:45:58 -0700 |
| commit | a6fe07e49e3fc12169e801b1ed6874c3a5bd8500 (patch) | |
| tree | b87a7e6f37da5c8e13eb4d4653cfc8ce9239d8f0 /bin/23commit | |
| parent | e27244386c346f459d1569db26344407a0372a05 (diff) | |
| parent | 005424d0c899aa899f43f583a6c74deb13ea4be1 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts:
httemplate/misc/process/cancel_pkg.html
Diffstat (limited to 'bin/23commit')
| -rwxr-xr-x | bin/23commit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/23commit b/bin/23commit index b7b0c1e57..d64459cf0 100755 --- a/bin/23commit +++ b/bin/23commit @@ -19,7 +19,7 @@ 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 ) ", + "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p1 ) ", " && ( ( git pull && git commit -m $desc @ARGV && git push ); ", "( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push ) )" ); |