summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-27 09:56:50 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-27 09:56:51 -0700
commit880c267a2400d9374d7ca4501313e5ab9f5392fb (patch)
tree8f670afbf0568d9932cbda3217c585b68972a08a /git-rebase--merge.sh
parent2a5618ec78c5689295fa7feae590823df606f3b3 (diff)
parent3cddb008c15978ae81ff144e24303467076d200f (diff)
downloadgit-880c267a2400d9374d7ca4501313e5ab9f5392fb.tar.gz
Merge branch 'nb/gnome-keyring-build'
Build improvements for gnome-keyring (in contrib/) * nb/gnome-keyring-build: gnome-keyring: Don't hard-code pkg-config executable
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions