diff options
| author | Dennis Schridde <devurandom@gmx.net> | 2010-09-03 11:04:44 +0200 |
|---|---|---|
| committer | Dennis Schridde <devurandom@gmx.net> | 2010-09-03 11:04:44 +0200 |
| commit | 9ab1918a14e03df522069c7d82129f86f1f6a4a8 (patch) | |
| tree | 09dd3bc3fd72a9270cfb919b35f279f2b1407e37 | |
| parent | f69cfe3286bbc439aea38e3c9711bc933287ab00 (diff) | |
| download | kde-9ab1918a14e03df522069c7d82129f86f1f6a4a8.tar.gz kde-9ab1918a14e03df522069c7d82129f86f1f6a4a8.tar.bz2 kde-9ab1918a14e03df522069c7d82129f86f1f6a4a8.zip | |
[Documentation] githooks manpage [1] says post-merge is called after git-pull
I'll leave post-checkout in the docs as it might also be necessary in certain circumstances.
[1] http://www.kernel.org/pub/software/scm/git/docs/githooks.html
| -rw-r--r-- | Documentation/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/README b/Documentation/README index 29e3620fb62..19b90ecac12 100644 --- a/Documentation/README +++ b/Documentation/README @@ -18,7 +18,7 @@ put this into /etc/eix-sync.conf: @cd /var/lib/layman/kde/Documentation && sh ./metadata-sync Your local git copy will almost always be newer than what the metadata mirror server had. - Hence in addition to the above, you might want to put this into .git/hooks/post-checkout: + Hence in addition to the above, you might want to put this into .git/hooks/post-{checkout,merge}: https://git.wiki.kernel.org/index.php/ExampleScripts#Setting_the_timestamps_of_the_files_to_the_commit_timestamp_of_the_commit_which_last_touched_them WARNING: Doing this is usually considered DANGEROUS and can break stuff in unexpected ways! |