From 4d51a6d5547b2e110baffb8247783828522c9e5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 27 Jul 2016 10:53:04 +0300 Subject: [PATCH] branch.sh: rebase against personal/gstrauss/master --- branch.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/branch.sh b/branch.sh index eea028d..ebc608e 100755 --- a/branch.sh +++ b/branch.sh @@ -4,7 +4,7 @@ svn=svn://svn.lighttpd.net/lighttpd url=https://git.lighttpd.net/lighttpd/lighttpd1.4.git package=lighttpd tag=lighttpd-1.4.40 -branch=master +branch=personal/gstrauss/master out=$package-branch.diff repo=$package.git @@ -24,10 +24,11 @@ d=$- filter() { set -$d # Excluding files which change version or were not in dist tarball - filterdiff \ + filterdiff -p1 \ -x 'CMakeLists.txt' \ -x 'configure.ac' \ -x 'SConstruct' \ + -x 'packdist.sh' \ | cat } -- 2.43.0