]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ma/simplify-merge-config-parsing'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:56 +0000 (13:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:56 +0000 (13:42 -0700)
commit82fa169d551d71fd21d8a6368040e19d209f79ab
tree9ea4a78018a370d809350be858d9010b659a9b18
parentb3eb70e0f8988dbf36f42e0bea201e2cd71f248e
parent9881b451f33b7b0df247a4b28a9c08c65eb4ca95
Merge branch 'ma/simplify-merge-config-parsing'

Code simplification.

* ma/simplify-merge-config-parsing:
  merge: use skip_prefix to parse config key