diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-05 16:34:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-05 16:34:51 -0700 |
| commit | 77e6f5bc1009aa588a3b2235758bf5be13b23d85 (patch) | |
| tree | cb040ac72459291eda6adf1aa9f10778bc54cdbf /contrib | |
| parent | 33580fbd308593e36395926fd35b501976ad322a (diff) | |
| parent | b5da24679ec73f458988523dce9dd17b4e9b0e02 (diff) | |
| download | git-77e6f5bc1009aa588a3b2235758bf5be13b23d85.tar.gz git-77e6f5bc1009aa588a3b2235758bf5be13b23d85.tar.xz | |
Merge branch 'maint'
* maint:
Fix lseek(2) calls with args 2 and 3 swapped
Honor -p<n> when applying git diffs
Fix dependency of common-cmds.h
Fix renaming branch without config file
DESTDIR support for git/contrib/emacs
gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
Document --left-right option to rev-list.
Revert "builtin-archive: use RUN_SETUP"
rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
rerere: make sorting really stable.
Fix t4200-rerere for white-space from "wc -l"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/emacs/Makefile | 4 | ||||
| -rw-r--r-- | contrib/hooks/post-receive-email (renamed from contrib/hooks/post-receieve-email) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile index 8554e3967..98aa0aae9 100644 --- a/contrib/emacs/Makefile +++ b/contrib/emacs/Makefile @@ -11,8 +11,8 @@ emacsdir = $(prefix)/share/emacs/site-lisp all: $(ELC) install: all - $(INSTALL) -d $(emacsdir) - $(INSTALL_ELC) $(ELC) $(emacsdir) + $(INSTALL) -d $(DESTDIR)$(emacsdir) + $(INSTALL_ELC) $(ELC) $(DESTDIR)$(emacsdir) %.elc: %.el $(EMACS) -batch -f batch-byte-compile $< diff --git a/contrib/hooks/post-receieve-email b/contrib/hooks/post-receive-email index 65160153e..65160153e 100644 --- a/contrib/hooks/post-receieve-email +++ b/contrib/hooks/post-receive-email |