git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da05cac cd93e6c)
Merge branch 'js/partial-urlmatch'
authorJunio C Hamano <redacted>
Tue, 5 May 2020 21:54:29 +0000 (14:54 -0700)
committerJunio C Hamano <redacted>
Tue, 5 May 2020 21:54:30 +0000 (14:54 -0700)
The same as js/partial-urlmatch-2.17, built on more recent codebase
to avoid unnecessary merge conflicts.

* js/partial-urlmatch:
  credential: handle `credential.<partial-URL>.<key>` again
  credential: optionally allow partial URLs in credential_from_url_gently()

1  2 
credential.c patch | diff1 | diff2 | blob | history

diff --cc credential.c
Simple merge
git clone https://git.99rst.org/PROJECT