diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-02-27 14:07:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 14:07:51 -0800 |
| commit | 6d21667206c4c2b10aad99eca1530a4f17c4e61d (patch) | |
| tree | 043b5873b9c312d39c71a09e9b6ebb641f4dd084 | |
| parent | Merge branch 'git-p4' of git://repo.or.cz/git/git-p4 (diff) | |
| parent | Eliminate confusing "won't bisect on seeked tree" failure (diff) | |
| download | tgif-6d21667206c4c2b10aad99eca1530a4f17c4e61d.tar.xz | |
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.txt | 4 | ||||
| -rwxr-xr-x | git-rebase--interactive.sh | 4 | ||||
| -rwxr-xr-x | t/t5505-remote.sh | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 340f1be02a..bec9accc89 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 fb12b03b20..c2bedd622c 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 636aec2f71..4fc62f550c 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" && |