[PATCH] Add -3 parameter to git am
Paul Poulain
paul.poulain at biblibre.com
Fri Nov 4 10:59:47 CET 2011
With this patch, the git am now automatically has a -3 parameter
That makes no difference for patches that applies directly, but is useful when it's not the case
---
git-bz | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-bz b/git-bz
index 0d1fc91..9ebdf0a 100755
--- a/git-bz
+++ b/git-bz
@@ -1494,7 +1494,8 @@ def do_apply(bug_reference):
f.close()
try:
- process = git.am(filename, _interactive=True)
+ #process = git.am(filename, _interactive=True)
+ process = git.am(filename, **{'_interactive': True, '3': True})
except CalledProcessError:
print "Patch left in %s" % filename
break
--
1.7.5.4
--------------020700020409070904060802--
More information about the Koha-devel
mailing list