From: Junio C Hamano <junkio@cox.net>
Date: Thu, 12 Oct 2006 07:46:06 +0000 (-0700)
Subject: Merge branch 'jc/blame' into jc/web-blame
X-Git-Tag: v1.4.4-rc1~69^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/66d0ff1bd35530f84c2b73e2b0e367637805217a?ds=inline;hp=-c

Merge branch 'jc/blame' into jc/web-blame

* jc/blame:
blame: Document and add help text for -f, -n, and -p
Remove git-annotate.perl and create a builtin-alias for git-blame
---

66d0ff1bd35530f84c2b73e2b0e367637805217a
diff --combined Makefile
index 20bda7d797,7e62e760d0..473ff271fe
--- a/Makefile
+++ b/Makefile
@@@ -132,8 -132,6 +132,8 @@@ GITWEB_HOMETEXT = indextext.htm
  GITWEB_CSS = gitweb.css
  GITWEB_LOGO = git-logo.png
  GITWEB_FAVICON = git-favicon.png
 +GITWEB_SITE_HEADER =
 +GITWEB_SITE_FOOTER =
  
  export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
  
@@@ -175,7 -173,7 +175,7 @@@ SCRIPT_SH = 
  SCRIPT_PERL = \
  	git-archimport.perl git-cvsimport.perl git-relink.perl \
  	git-shortlog.perl git-rerere.perl \
- 	git-annotate.perl git-cvsserver.perl \
+ 	git-cvsserver.perl \
  	git-svnimport.perl git-cvsexportcommit.perl \
  	git-send-email.perl git-svn.perl
  
@@@ -267,6 -265,7 +267,7 @@@ LIB_OBJS = 
  
  BUILTIN_OBJS = \
  	builtin-add.o \
+ 	builtin-annotate.o \
  	builtin-apply.o \
  	builtin-archive.o \
  	builtin-cat-file.o \
@@@ -677,8 -676,6 +678,8 @@@ gitweb/gitweb.cgi: gitweb/gitweb.per
  	    -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
  	    -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
  	    -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
 +	    -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
 +	    -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
  	    $< >$@+
  	chmod +x $@+
  	mv $@+ $@