diff options
author | Junio C Hamano <junkio@cox.net> | 2007-04-06 03:34:51 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-04-06 03:34:51 +0400 |
commit | 77e6f5bc1009aa588a3b2235758bf5be13b23d85 (patch) | |
tree | cb040ac72459291eda6adf1aa9f10778bc54cdbf /Makefile | |
parent | 33580fbd308593e36395926fd35b501976ad322a (diff) | |
parent | b5da24679ec73f458988523dce9dd17b4e9b0e02 (diff) |
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 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -727,7 +727,7 @@ help.o: common-cmds.h $(BUILT_INS): git$X $(QUIET_BUILT_IN)rm -f $@ && ln git$X $@ -common-cmds.h: Documentation/git-*.txt +common-cmds.h: $(wildcard Documentation/git-*.txt) $(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh |