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-12-05 18:38:04 +00:00
2013-09-06 13:29:04 -07:00
2013-12-06 15:17:28 -05:00
2013-10-21 10:17:48 -07:00
2012-11-12 18:58:07 +00:00
2013-05-17 17:21:21 +00:00
2013-05-20 20:40:03 +00:00
2012-11-10 23:50:17 +00:00
2013-12-04 10:12:29 -08:00