Merge branch 'maint'

* maint:
  Whip post 1.5.3.4 maintenance series into shape.
  rebase -i: use diff plumbing instead of porcelain
  Do not remove distributed configure script
  git-archive: document --exec
  git-reflog: document --verbose
  git-config: handle --file option with relative pathname properly
  clear_commit_marks(): avoid deep recursion
  git add -i: Remove unused variables
  git add -i: Fix parsing of abbreviated hunk headers
  git-config: don't silently ignore options after --list
  Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
  Fix embarrassing "git log --follow" bug

Conflicts:

	RelNotes
	git-rebase--interactive.sh

diff --cc Makefile
index 55fbcb73e1b7e98545ee081b823fd05284a8506f,c63d656f5d8ae3f66f0eca5760dbc71e3ab09210..d74ac93c116fe24d1a23df1c7c21d9ca0cc1c23f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1097,9 -1074,9 +1100,9 @@@ clean
                $(LIB_FILE) $(XDIFF_LIB)
        $(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
        $(RM) $(TEST_PROGRAMS)
 -      $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
 +      $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
        $(RM) -r autom4te.cache
-       $(RM) configure config.log config.mak.autogen config.mak.append config.status config.cache
+       $(RM) config.log config.mak.autogen config.mak.append config.status config.cache
        $(RM) -r $(GIT_TARNAME) .doc-tmp-dir
        $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
        $(RM) $(htmldocs).tar.gz $(manpages).tar.gz

diff --cc commit.c
Simple merge

diff --cc git-rebase--interactive.sh
index 050140d666b2d68ab91f6d41d64779178e99c70b,50b79ff8ff289f43ca92738656e37bc2545c5bc6..df4cedb8594ef795933bb02447d9a96815e2d64b
--- 1/git-rebase--interactive.sh
--- 2/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -78,13 -77,8 +78,13 @@@ mark_action_done () 
  }
  
  make_patch () {
 -      parent_sha1=$(git rev-parse --verify "$1"^ 2> /dev/null)
 +      parent_sha1=$(git rev-parse --verify "$1"^) ||
 +              die "Cannot get patch for $1^"
-       git diff "$parent_sha1".."$1" > "$DOTEST"/patch
+       git diff-tree -p "$parent_sha1".."$1" > "$DOTEST"/patch
 +      test -f "$DOTEST"/message ||
 +              git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message
 +      test -f "$DOTEST"/author-script ||
 +              get_author_ident_from_commit "$1" > "$DOTEST"/author-script
  }
  
  die_with_patch () {
@@@ -317,18 -298,13 +317,18 @@@ do_next () 
        else
                NEWHEAD=$(git rev-parse HEAD)
        fi &&
 -      message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
 -      git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 -      git symbolic-ref HEAD $HEADNAME && {
 +      case $HEADNAME in
 +      refs/*)
 +              message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
 +              git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
 +              git symbolic-ref HEAD $HEADNAME
 +              ;;
 +      esac && {
                test ! -f "$DOTEST"/verbose ||
-                       git diff --stat $(cat "$DOTEST"/head)..HEAD
+                       git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
        } &&
        rm -rf "$DOTEST" &&
 +      git gc --auto &&
        warn "Successfully rebased and updated $HEADNAME."
  
        exit

diff --cc log-tree.c
Simple merge

diff --cc revision.c
Simple merge