diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-27 03:13:31 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-27 03:13:31 +0400 |
commit | a5ad8d1bddecfcbe318e5e409e6e9e40c7c073d3 (patch) | |
tree | ed77c22d84395d3c766686c6da92b014974b07e4 /Documentation/git-svn.txt | |
parent | f0911b996cac9b89b9175676f74bbcb5a9a9e34f (diff) | |
parent | f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5 (diff) |
Merge branch 'cn/eradicate-working-copy' into maint
* cn/eradicate-working-copy:
Remove 'working copy' from the documentation and C code
Diffstat (limited to 'Documentation/git-svn.txt')
-rw-r--r-- | Documentation/git-svn.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 08cad6d2b6..f977e8780b 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -318,7 +318,7 @@ Any other arguments are passed directly to 'git log' Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, - local uncommitted changes in the working copy are ignored; + local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'. + |