merge, pull: stop advising 'commit -a' in case of conflict
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Thu, 28 Aug 2014 09:46:58 +0000 (11:46 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Aug 2014 17:29:53 +0000 (10:29 -0700)
commit91e70e0...ac3e72eb81e10273b48d884553e7d01d
treecbabcaa...bcfcd6647936d596eccedda92d95e7e1copy hash to clipboard (tree)
parent6c4ab27...2378ce67940b4496365043119d7ffff2copy hash to clipboard (diff)
advice.c
git-pull.sh