diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-05-16 18:46:30 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-05-16 18:46:30 +0000 |
| commit | 9aac3d3f9c74a0d0ecfdbb483511352120a01b97 (patch) | |
| tree | c3fb3e187e531854a592fabda11638f96a6ca9b4 | |
| parent | 0e5e23c57d4c19de54f52c5305f3ffc9c932ab0a (diff) | |
| download | quilt-9aac3d3f9c74a0d0ecfdbb483511352120a01b97.tar.gz | |
- Rename DIFF_OPTS environment variable to QUILT_DIFF_OPTS
- Add ~/.quiltrc resource file (this file is sourced from
the patchfsn file, which is used by all commands).
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | scripts/patchfns.in | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index f141734..311a682 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri May 16 20:44:50 CEST 2003 - agruen@suse.de + +- Rename DIFF_OPTS environment variable to QUILT_DIFF_OPTS +- Add ~/.quiltrc resource file (this file is sourced from + the patchfsn file, which is used by all commands). + +------------------------------------------------------------------- Fri Apr 11 17:17:35 CEST 2003 - agruen@suse.de - Apply patches with `patch -f' by default. Add --interactive diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 011338b..e2daff8 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -10,6 +10,11 @@ export TEXTDOMAIN=quilt +if [ -e $HOME/.quiltrc ] +then + . $HOME/.quiltrc +fi + if [ -n "$PATCHSCRIPTS" ] then P=$PATCHSCRIPTS/ @@ -551,7 +556,7 @@ diff_file() new_hdr=$dir/$file fi - @DIFF@ -Nu $DIFF_OPTS $old_file $new_file | + @DIFF@ -Nu $QUILT_DIFF_OPTS $old_file $new_file | if read line then echo "Index: $new_hdr" |