summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-11 17:33:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-11 17:33:30 (GMT)
commit785514bb5544fbe2604ea657530134671f82e4b1 (patch)
tree9d532ce1491690315135d93f0a830e98d61c50c9 /refs.c
parent683b4d828c145594d5ef8dfbefb847dbe23c2c14 (diff)
parent91e70e00ac3e72eb81e10273b48d884553e7d01d (diff)
downloadgit-785514bb5544fbe2604ea657530134671f82e4b1.zip
git-785514bb5544fbe2604ea657530134671f82e4b1.tar.gz
git-785514bb5544fbe2604ea657530134671f82e4b1.tar.bz2
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 'refs.c')
0 files changed, 0 insertions, 0 deletions