| commit | 785514bb5544fbe2604ea657530134671f82e4b1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Sep 2014 17:33:29 +0000 (11 10:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Sep 2014 17:33:30 +0000 (11 10:33 -0700) | ||
| tree | 9d532ce1491690315135d93f0a830e98d61c50c9 | treesnapshot (tar.gz zip) |
| parent | 683b4d828c145594d5ef8dfbefb847dbe23c2c14 | commitdiff |
| parent | 91e70e00ac3e72eb81e10273b48d884553e7d01d | commitdiff |
Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
* mm/discourage-commit-a-to-finish-conflict-resolution:
merge, pull: stop advising 'commit -a' in case of conflict
* mm/discourage-commit-a-to-finish-conflict-resolution:
merge, pull: stop advising 'commit -a' in case of conflict