]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3eb70e 9881b45)
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)
Code simplification.

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


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