From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Feb 2008 22:07:51 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~127
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6d21667206c4c2b10aad99eca1530a4f17c4e61d;p=git.git

Merge branch 'maint'

* maint:
  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
  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.
  Don't use GIT_CONFIG in t5505-remote

Conflicts:

	t/t9001-send-email.sh
	t/t9200-git-cvsexportcommit.sh
---

6d21667206c4c2b10aad99eca1530a4f17c4e61d
diff --cc Documentation/git-svn.txt
index 340f1be02,115b8bee0..bec9accc8
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@@ -159,15 -159,12 +159,19 @@@ New features
  	our version of --pretty=oneline
  --
  +
+ NOTE: SVN itself only stores times in UTC and nothing else. The regular svn
+ client converts the UTC time to the local time (or based on the TZ=
+ environment). This command has the same behaviour.
+ +
  Any other arguments are passed directly to `git log'
  
 +'blame'::
 +       Show what revision and author last modified each line of a file. This is
 +       identical to `git blame', but SVN revision numbers are shown instead of git
 +       commit hashes.
 ++
 +All arguments are passed directly to `git blame'.
 +
  --
  'find-rev'::
  	When given an SVN revision number of the form 'rN', returns the