From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Sep 2007 00:42:15 +0000 (-0700)
Subject: Merge branch 'master' into ph/strbuf
X-Git-Tag: v1.5.4-rc0~295^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=39bd2eb56af89d43a08ba54699d9a1849ab57b39;p=git.git

Merge branch 'master' into ph/strbuf

* master: (94 commits)
  Fixed update-hook example allow-users format.
  Documentation/git-svn: updated design philosophy notes
  t/t4014: test "am -3" with mode-only change.
  git-commit.sh: Shell script cleanup
  preserve executable bits in zip archives
  Fix lapsus in builtin-apply.c
  git-push: documentation and tests for pushing only branches
  git-svnimport: Use separate arguments in the pipe for git-rev-parse
  contrib/fast-import: add perl version of simple example
  contrib/fast-import: add simple shell example
  rev-list --bisect: Bisection "distance" clean up.
  rev-list --bisect: Move some bisection code into best_bisection.
  rev-list --bisect: Move finding bisection into do_find_bisection.
  Document ls-files --with-tree=<tree-ish>
  git-commit: partial commit of paths only removed from the index
  git-commit: Allow partial commit of file removal.
  send-email: make message-id generation a bit more robust
  git-apply: fix whitespace stripping
  git-gui: Disable native platform text selection in "lists"
  apply --index-info: fall back to current index for mode changes
  ...
---

39bd2eb56af89d43a08ba54699d9a1849ab57b39