summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-27 22:07:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-27 22:07:51 (GMT)
commit6d21667206c4c2b10aad99eca1530a4f17c4e61d (patch)
tree043b5873b9c312d39c71a09e9b6ebb641f4dd084
parenta0a80f1e8ac367634314ee8e2ca159c527da3a24 (diff)
parent0f497e75f05cdf0c0c1278eaba898cda6f118d71 (diff)
downloadgit-6d21667206c4c2b10aad99eca1530a4f17c4e61d.zip
git-6d21667206c4c2b10aad99eca1530a4f17c4e61d.tar.gz
git-6d21667206c4c2b10aad99eca1530a4f17c4e61d.tar.bz2
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
-rw-r--r--Documentation/git-svn.txt4
-rwxr-xr-xgit-rebase--interactive.sh4
-rwxr-xr-xt/t5505-remote.sh3
3 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 340f1be..bec9acc 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -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'::
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index fb12b03..c2bedd6 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -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)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 636aec2..4fc62f5 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -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" &&