From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Mar 2008 09:20:19 +0000 (-0800)
Subject: Merge commit '74359821' into js/reflog-delete
X-Git-Tag: v1.5.5-rc0~56^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f830d45b9fdb04a5d79c25bb3a3d891d8d3b58e9;p=git.git

Merge commit '74359821' into js/reflog-delete

* commit '74359821': (128 commits)
  tests: introduce test_must_fail
  Fix builtin checkout crashing when given an invalid path
  templates/Makefile: don't depend on local umask setting
  Correct name of diff_flush() in API documentation
  Start preparing for 1.5.4.4
  format-patch: remove a leftover debugging message
  completion: support format-patch's --cover-letter option
  Eliminate confusing "won't bisect on seeked tree" failure
  builtin-reflog.c: don't install new reflog on write failure
  send-email: fix In-Reply-To regression
  git-svn: Don't prompt for client cert password everytime.
  git.el: Do not display empty directories.
  Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR
  Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR
  Prompt to continue when editing during rebase --interactive
  Documentation/git svn log: add a note about timezones.
  git-p4: Support usage of perforce client spec
  git-p4: git-p4 submit cleanups.
  git-p4: Removed git-p4 submit --direct.
  git-p4: Clean up git-p4 submit's log message handling.
  ...
---

f830d45b9fdb04a5d79c25bb3a3d891d8d3b58e9