The branch, master has been updated
via bc55aa0 Set GIT_MERGE_AUTOEDIT=no in the environment.
from f438d5a Match latest git's repo branch message.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bc55aa04dfe77d2b680eab2ea74b46f8a29e5ccb
Author: Wayne Davison <way...@samba.org>
Date: Thu Jul 31 15:59:32 2014 -0700
Set GIT_MERGE_AUTOEDIT=no in the environment.
-----------------------------------------------------------------------
Summary of changes:
packaging/patch-update | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/patch-update b/packaging/patch-update
index a1cb42c..4839716 100755
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -23,6 +23,8 @@ my $make_gen_cmd = 'make -f prepare-source.mak conf &&
./config.status && make g
);
&usage if $help_opt;
+$ENV{GIT_MERGE_AUTOEDIT} = 'no';
+
if (defined $incl_generated_files) {
$patches_dir = $incl_generated_files if $incl_generated_files ne '';
$incl_generated_files = 1;
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
