]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 683b4d8 91e70e0)
Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:29 +0000 (10:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:30 +0000 (10:33 -0700)
* mm/discourage-commit-a-to-finish-conflict-resolution:
  merge, pull: stop advising 'commit -a' in case of conflict


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.