| commit | f0e151a4325f186eac0771ddbdc2a55bcb9392a0 | |
| author | David Aguilar <davvid@gmail.com> | |
| Thu, 12 Apr 2012 07:08:59 +0000 (12 00:08 -0700) | ||
| committer | David Aguilar <davvid@gmail.com> | |
| Thu, 12 Apr 2012 07:08:59 +0000 (12 00:08 -0700) | ||
| tree | 8624225d6a0d5c6a6fe1a4e68bb465aaea3af1a2 | treesnapshot (tar.gz zip) |
| parent | e29a026aa2aced3b4229548262db9b6727795f29 | commitdiff |
app: Prepare for git 1.7.10
Set GIT_MERGE_AUTOEDIT so that we don't end up spawning $EDITOR
on stdin for now. We can later start using `git merge --no-edit`
so that users always have a chance to explain their merges.
Signed-off-by: David Aguilar <davvid@gmail.com>
Set GIT_MERGE_AUTOEDIT so that we don't end up spawning $EDITOR
on stdin for now. We can later start using `git merge --no-edit`
so that users always have a chance to explain their merges.
Signed-off-by: David Aguilar <davvid@gmail.com>
| cola/app.py | diffblobblamehistory |