diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:30 -0700 |
| commit | 785514bb5544fbe2604ea657530134671f82e4b1 (patch) | |
| tree | 9d532ce1491690315135d93f0a830e98d61c50c9 /ewah/bitmap.c | |
| parent | 683b4d828c145594d5ef8dfbefb847dbe23c2c14 (diff) | |
| parent | 91e70e00ac3e72eb81e10273b48d884553e7d01d (diff) | |
| download | git-785514bb5544fbe2604ea657530134671f82e4b1.tar.gz | |
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
Diffstat (limited to 'ewah/bitmap.c')
0 files changed, 0 insertions, 0 deletions