diff options
| author |  Steven Grimm <koreth@midwinter.com> | 2008-05-10 22:11:18 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-11 10:12:19 -0700 |
| commit | 4be403815321976bc2ee4c6677799abb06b153aa (patch) | |
| tree | c0aa1a96147c96619aae8d4e1d93e0817091d2ec /Documentation | |
| parent | mergetool: Make ECMerge use the settings as specified by the user in the GUI (diff) | |
| download | tgif-4be403815321976bc2ee4c6677799abb06b153aa.tar.xz | |
Add svn-compatible "blame" output format to git-svn
git-svn blame produced output in the format of git blame; in environments
where there are scripts that read the output of svn blame, it's useful
to be able to use them with the output of git-svn. The git-compatible
format is still available using the new "--git-format" option.
This also fixes a bug in the initial git-svn blame implementation; it was
bombing out on uncommitted local changes.
Signed-off-by: Steven Grimm <koreth@midwinter.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-svn.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index f4ba1056f0..c6b56b4ef3 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -166,11 +166,18 @@ environment). This command has the same behaviour. Any other arguments are passed directly to `git log' 'blame':: - Show what revision and author last modified each line of a file. This is - identical to `git blame', but SVN revision numbers are shown instead of git - commit hashes. + 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; + the version of the file in the HEAD revision is annotated. Unknown + arguments are passed directly to git-blame. + -All arguments are passed directly to `git blame'. +--git-format;; + Produce output in the same format as `git blame', but with + SVN revision numbers instead of git commit hashes. In this mode, + changes that haven't been committed to SVN (including local + working-copy edits) are shown as revision 0. -- 'find-rev':: |