summaryrefslogtreecommitdiff
path: root/.git-hooks/post-merge
AgeCommit message (Collapse)Author
2015-02-13git-hooks: post-merge script does not need /bin/bashThomas Klausner
Just use /bin/sh, which exists on more systems. Change-Id: I5e5453b89841510473414a4c339b647b4f95ae7b
2012-10-16submodules migrationNorbert Thiebaud
Change-Id: Ib3e472a4b1abf880f695be7a6667393d6a82f10d