diff options
Diffstat (limited to 'quilt')
| -rw-r--r-- | quilt/push.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/quilt/push.in b/quilt/push.in index 9f04b13..34b00ad 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -44,9 +44,9 @@ be used. --fuzz=N Set the maximum fuzz factor (default: 2). --M, --merge +-M, --merge={rejects,fuzz,all} Three-way merge format: all changes are merged into the patched - files (see diff3(1), merge(1)). + files (see patch(1), diff3(1), merge(1)). --leave-rejects Leave around the reject files patch produced, even if the patch @@ -299,7 +299,10 @@ do --fuzz) opt_fuzz=$2 shift 2 ;; - -M|--merge) + -M) + opt_merge=rejects + shift 1 ;; + --merge) opt_merge=${2:-rejects} shift 2 ;; --leave-rejects) |