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

diff --cc Makefile
index bab75655635b17db80de05e04417c8e95fe70eb0,061864843fb662833d4d74aaa20f7108bcbec9e7..084b7fe1775c0527c724dd39bd710005e40499c7
--- 1/Makefile
--- 2/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' \