diff options
| -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" && |