|
|
| @@ -1,32 +0,0 @@
-From 02b6c8d3c07e3ca9aa091d4a865fe036e1794cbd Mon Sep 17 00:00:00 2001
-From: Adam Tkac <atkac@redhat.com>
-Date: Thu, 29 Nov 2012 16:18:03 +0100
-Subject: [PATCH] DESTDIR support in contrib/subtree/Makefile
-
-Signed-off-by: Adam Tkac <atkac@redhat.com>
----
- contrib/subtree/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
-index 05cdd5c..36ae3e4 100644
---- a/contrib/subtree/Makefile
-+++ b/contrib/subtree/Makefile
-@@ -30,12 +30,12 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
- doc: $(GIT_SUBTREE_DOC)
-
- install: $(GIT_SUBTREE)
-- $(INSTALL) -m 755 $(GIT_SUBTREE) $(libexecdir)
-+ $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir)
-
- install-doc: install-man
-
- install-man: $(GIT_SUBTREE_DOC)
-- $(INSTALL) -m 644 $^ $(man1dir)
-+ $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
-
- $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
- xmlto -m $(MANPAGE_NORMAL_XSL) man $^
---
-1.8.0.1
-
|
| @@ -0,0 +1,43 @@
+From 1963c852acc5d8c521a3e4f3b9ceb313d26a473c Mon Sep 17 00:00:00 2001
+From: Todd Zullinger <tmz@pobox.com>
+Date: Mon, 22 Jun 2009 08:00:29 -0400
+Subject: [PATCH] Update path to contrib/hooks/post-receive-email
+
+---
+ contrib/hooks/post-receive-email | 6 +++---
+ templates/hooks--post-receive.sample | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
+index 2a66063..4835ada 100755
+--- a/contrib/hooks/post-receive-email
++++ b/contrib/hooks/post-receive-email
+@@ -10,12 +10,12 @@
+ # This hook is stored in the contrib/hooks directory. Your distribution
+ # will have put this somewhere standard. You should make this script
+ # executable then link to it in the repository you would like to use it in.
+-# For example, on debian the hook is stored in
+-# /usr/share/doc/git-core/contrib/hooks/post-receive-email:
++# For example, on fedora the hook is stored in
++# /usr/share/git-core/contrib/hooks/post-receive-email:
+ #
+ # chmod a+x post-receive-email
+ # cd /path/to/your/repository.git
+-# ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive
++# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive
+ #
+ # This hook script assumes it is enabled on the central repository of a
+ # project, with all users pushing only to it and not between each other. It
+diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample
+index 18d2e0f..cf57878 100755
+--- a/templates/hooks--post-receive.sample
++++ b/templates/hooks--post-receive.sample
+@@ -12,4 +12,4 @@
+ # see contrib/hooks/ for a sample, or uncomment the next line and
+ # rename the file to "post-receive".
+
+-#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
++#. /usr/share/git-core/contrib/hooks/post-receive-email
+--
+1.6.3.2
+
|
