diff options
| author | Dennis Schridde <devurandom@gmx.net> | 2010-09-03 11:10:08 +0200 |
|---|---|---|
| committer | Dennis Schridde <devurandom@gmx.net> | 2010-09-03 11:10:08 +0200 |
| commit | 8901adc698800944ccb1808ac4ba20c34490df8a (patch) | |
| tree | e353a769c71a89599ede8775d5c2b22c98cc97cf | |
| parent | 9ab1918a14e03df522069c7d82129f86f1f6a4a8 (diff) | |
| download | kde-8901adc698800944ccb1808ac4ba20c34490df8a.tar.gz kde-8901adc698800944ccb1808ac4ba20c34490df8a.tar.bz2 kde-8901adc698800944ccb1808ac4ba20c34490df8a.zip | |
Revert "[Documentation] githooks manpage [1] says post-merge is called after git-pull"
post-merge takes different parameters than expected, so it cannot be used with the mentioned script.
This reverts commit 9ab1918a14e03df522069c7d82129f86f1f6a4a8.
| -rw-r--r-- | Documentation/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/README b/Documentation/README index 19b90ecac12..29e3620fb62 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,merge}: + Hence in addition to the above, you might want to put this into .git/hooks/post-checkout: 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! |