Cedric Brandily 18f34f0cbc -F/--force-rebase has no effect if rebase is disabled by config
--force-rebase has no effect if rebase is disabled through git-config
or git-review config files.

This change ensures -F/--force-rebase "wins" over rebase disabled and
-F/--force-rebase becomes mutually exclusive with -R/--no-rebase.

Change-Id: Idd985a6a7a5b1cffa9bed996bb1ea5907e7d0844
2014-09-03 19:55:05 +02:00
..
2013-08-15 21:08:08 +00:00