Merge branch 'remote'
commit8ea3d833f77791dfe71c33f24ac6672733316a9a
authorDavid Aguilar <davvid@gmail.com>
Fri, 28 Oct 2016 05:32:21 +0000 (27 22:32 -0700)
committerDavid Aguilar <davvid@gmail.com>
Fri, 28 Oct 2016 05:32:31 +0000 (27 22:32 -0700)
treebcae27a3f1d4430f3425c6e96ce09555a3bf08ce
parent43596ec887363021a18b1fd999a8fbbd91dc19bd
parent36daee43432c204ca12a57cb9c1af1cfab75873c
Merge branch 'remote'

* remote:
  doc: update v2.9 release notes draft
  remote: make the fast-forward checkboxes mutually exclusive
  remote: simplify and improve how fast-forward flags are handled
  remote: initialize size using desktop geometry
  qtutils: add desktop() helper
  remote: do not hide the fast-forward-only checkbox for "pull"

Signed-off-by: David Aguilar <davvid@gmail.com>