diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-02-04 11:59:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-04 11:59:02 -0400 |
| commit | dcae58d6262117122dc8af0a0e6fc63ed2c25c88 (patch) | |
| tree | c394be44bd65b8e4b7be4d8c90e3608400e148fc /contrib | |
| parent | c0a2701284a800f55abdd61f0b8619582c399a9e (diff) | |
| parent | ab7a7f421c9b57b5963a44e57a6a4df7c594aca6 (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/post-merge-hook | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/post-merge-hook b/contrib/post-merge-hook index fa9ab5b6..4bbb1de7 100755 --- a/contrib/post-merge-hook +++ b/contrib/post-merge-hook @@ -1,7 +1,7 @@ #!/bin/sh # -# git post-merge hook, used by propellor's author to maintain a -# joeyconfig branch with some changes while being able to merge +# git post-merge (and post-checkout) hook, used by propellor's author to +# maintain a joeyconfig branch with some changes while being able to merge # between it and branches without the changes. # # Each time this hook is run, it checks if it's on a branch with |