commit | 95bf82c2ab7e6f0c432ea01094b482a66548ef07 | [log] [tgz] |
---|---|---|
author | Vincent Driessen <vincent@datafox.nl> | 周二 2月 02 11:58:37 2010 +0100 |
committer | Vincent Driessen <vincent@datafox.nl> | 周二 2月 02 11:58:37 2010 +0100 |
tree | 3f07f1dc61c73a1d78dafc8272ec44ed6a785688 | |
parent | 9cf5673475871707dbeb986d29531e94ed655849 [diff] |
Add support for the -r (--rebase) option, before doing the actual merge.