From: Junio C Hamano <junkio@cox.net>
Date: Sun, 11 Mar 2007 07:00:11 +0000 (-0800)
Subject: Merge branch 'js/revert-cherry'
X-Git-Tag: v1.5.1-rc1~65
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e286114d0edbed846149227d48f75338fea760e5;p=git.git

Merge branch 'js/revert-cherry'

* js/revert-cherry:
  cherry-pick: Bug fix 'cherry picked from' message.
  cherry-pick: Suggest a better method to retain authorship
  Make git-revert & git-cherry-pick a builtin
---

e286114d0edbed846149227d48f75338fea760e5
diff --cc Makefile
index bab756556,061864843..084b7fe17
--- a/Makefile
+++ b/Makefile
@@@ -711,18 -686,16 +712,15 @@@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % 
  	    -e '}' \
  	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
  	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 -	    $@.perl >$@+
 -	chmod +x $@+
 +	    $@.perl >$@+ && \
 +	chmod +x $@+ && \
  	mv $@+ $@
  
- git-cherry-pick: git-revert
- 	$(QUIET_GEN)cp $< $@+ && mv $@+ $@
- 
  git-status: git-commit
 -	cp $< $@+
 -	mv $@+ $@
 +	$(QUIET_GEN)cp $< $@+ && mv $@+ $@
  
  gitweb/gitweb.cgi: gitweb/gitweb.perl
 -	rm -f $@ $@+
 +	$(QUIET_GEN)rm -f $@ $@+ && \
  	sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
  	    -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
  	    -e 's|++GIT_BINDIR++|$(bindir)|g' \