diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-04-05 16:19:00 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-04-05 19:44:34 +0200 |
| commit | 5146fe9c64319d49edbc05eacedc4e87f151476d (patch) | |
| tree | 516dcb00808b2af9e5987683b8d53db32e6e39fe /quilt.changes | |
| parent | cda421f2c753f797d6b1886b55f6ee33f0c7e87b (diff) | |
| download | quilt-5146fe9c64319d49edbc05eacedc4e87f151476d.tar.gz | |
- Push command: don't imply --force when --merge is given so that
a patch that doesn't merge cleanly will still require to
spcify --force separately. Update merge syntax highlighting.
Diffstat (limited to 'quilt.changes')
| -rw-r--r-- | quilt.changes | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/quilt.changes b/quilt.changes index e8430e0..ffe62c9 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Sun Apr 5 16:05:05 CEST 2009 - agruen@suse.de + +- Push command: don't imply --force when --merge is given so that + a patch that doesn't merge cleanly will still require to + spcify --force separately. Update merge syntax highlighting. + +------------------------------------------------------------------- +Tue Mar 31 14:16:07 CEST 2009 - agruen@suse.de + +- Rename push's -M option to -m. + +------------------------------------------------------------------- Sun Mar 8 22:17:46 CET 2009 - agruen@suse.de - series and patches commands: add --color options for colorizing |