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
This commit is contained in:
Junio C Hamano 2008-02-27 14:07:51 -08:00
commit 6d21667206
3 changed files with 8 additions and 3 deletions

View File

@ -159,6 +159,10 @@ 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'::

View File

@ -268,6 +268,10 @@ do_next () {
warn
warn " git commit --amend"
warn
warn "Once you are satisfied with your changes, run"
warn
warn " git rebase --continue"
warn
exit 0
;;
squash|s)

View File

@ -4,9 +4,6 @@ test_description='git remote porcelain-ish'
. ./test-lib.sh
GIT_CONFIG=.git/config
export GIT_CONFIG
setup_repository () {
mkdir "$1" && (
cd "$1" &&