diff options
author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-01-02 13:33:32 +0100 |
---|---|---|
committer | Jean Delvare <jdelvare@suse.de> | 2010-01-27 13:49:51 +0100 |
commit | a5960daef44bd5b028bfe8ea3482566e80a9501c (patch) | |
tree | 0c6852f6ddb48b951ec32ecfef992d4678874cd2 /quilt.changes | |
parent | 0f702aa9f3457aaa7fbfc6148e9b6f28036effe6 (diff) | |
download | quilt-a5960daef44bd5b028bfe8ea3482566e80a9501c.tar.gz |
push: patch's --merge option has an optional argument now
Since version 2.6.1 the patch utility knows an optional argument for
--merge. Regognize this and pass it on to patch.
Diffstat (limited to 'quilt.changes')
-rw-r--r-- | quilt.changes | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/quilt.changes b/quilt.changes index 76ed1fe..6d10ac5 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 27 13:39:06 CET 2010 - bert.wesarg@googlemail.com + +- quilt/push.in: patch's --merge option has an optional argument + now. + +------------------------------------------------------------------- Wed Jan 27 13:38:02 CET 2010 - hertzog@debian.org - quilt/scripts/patchfns.in: Skip non-files when selecting the |