diff options
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/pop.in | 6 | ||||
| -rw-r--r-- | quilt/push.in | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 02f115e..a7eb688 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56,10 +56,7 @@ BIN := $(BIN_IN) SRC += $(BIN_SRC:%=bin/%) DIRT += $(BIN_IN:%=bin/%) -QUILT_IN := add annotate applied delete diff edit files fold fork graph \ - grep import mail new next patches pop previous push refresh \ - remove rename series setup snapshot top unapplied upgrade - +QUILT_IN := $(patsubst quilt/%.in,%,$(wildcard quilt/*.in)) QUILT_SRC := $(QUILT_IN:%=%.in) QUILT := $(QUILT_IN) SRC += $(QUILT_SRC:%=quilt/%) diff --git a/quilt.changes b/quilt.changes index 510d05b..5bd4da3 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 14 13:05:39 CEST 2005 - agruen@suse.de + +- Use wildcard to generate the list of all commands in Makefile + instead of explicitly listing them. +- Helptext improvements. + +------------------------------------------------------------------- Thu Jul 7 22:13:47 CEST 2005 - khali@linux-fr.org - Makefile.in: Properly set LINGUAS before running "make all" in diff --git a/quilt/pop.in b/quilt/pop.in index 42ddf65..ac67625 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -35,8 +35,8 @@ completion can be used. -f Force remove. The state before the patch(es) were applied will be restored from backup files. --R Remove the patch with \`patch -R' and check if the patch reverts - all changes properly. +-R Always verify if the patch removes cleanly; don't rely on + timestamp checks. -q Quiet operation. @@ -210,7 +210,7 @@ do unset opt_remove shift ;; -R) - opt_remove=1 # remove with patch -R; no tricks + opt_remove=1 unset opt_force shift ;; -q) diff --git a/quilt/push.in b/quilt/push.in index 6cb401a..2e2b70f 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -46,7 +46,7 @@ be used. --interactive Allow the patch utility to ask how to deal with conflicts. If - this option is not given, the option -f will be passed to the + this option is not given, the -f option will be passed to the patch program. --color[=always|auto|never] |