Monty Taylor 833096afe8 Don't attempt to open an interactive editor
Merging with git can cause git to want to pop you into an editor. That's
not cool in a script. Supply --no-edit to cause the commit to just work.

Change-Id: Ic70d74c28d1ca16ae21b2a6c141b26d4e68b21f0
2013-12-13 19:52:48 -05:00
..
2013-07-23 11:59:46 -07:00