diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-03-31 14:17:15 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-03-31 14:17:15 +0200 |
| commit | cda421f2c753f797d6b1886b55f6ee33f0c7e87b (patch) | |
| tree | f235584b26598caf9eedcb230ade824bfa9fa042 | |
| parent | 1cde03185046aa597c8bb62394ebf3b238760dcc (diff) | |
| download | quilt-cda421f2c753f797d6b1886b55f6ee33f0c7e87b.tar.gz | |
- Rename push's -M option to -m.
| -rw-r--r-- | quilt/push.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/quilt/push.in b/quilt/push.in index 538a92b..309fbc5 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -44,7 +44,7 @@ be used. --fuzz=N Set the maximum fuzz factor (default: 2). --M, --merge +-m, --merge Three-way merge format: all changes are merged into the patched files (see patch(1), diff3(1), merge(1)). @@ -269,7 +269,7 @@ list_patches() fi } -options=`getopt -o fqvaMh --long fuzz:,merge,leave-rejects,color:: -- "$@"` +options=`getopt -o fqvamh --long fuzz:,merge,leave-rejects,color:: -- "$@"` if [ $? -ne 0 ] then @@ -299,7 +299,7 @@ do --fuzz) opt_fuzz=$2 shift 2 ;; - -M | --merge) + -m | --merge) opt_merge=1 shift 1 ;; --leave-rejects) |