diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-06 16:47:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-06 16:47:32 -0700 |
| commit | 4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e (patch) | |
| tree | e5bfb6f6467031660b19a3afeb51cbd732664342 /Documentation/git-annotate.txt | |
| parent | 80d12c23de4fbddfaee2f9bf7fe809f57d02e171 (diff) | |
| parent | aaefbfa66c348a461b3081873ef42819c8b38dac (diff) | |
| download | git-4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e.tar.gz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.6.0.2
stash: refresh the index before deciding if the work tree is dirty
Mention the fact that 'git annotate' is only for backward compatibility.
"blame -c" should be compatible with "annotate"
git-gui: Fix diff parsing for lines starting with "--" or "++"
git-gui: Fix string escaping in po2msg.sh
git gui: show diffs with a minimum of 1 context line
git-gui: update all remaining translations to French.
git-gui: Update french translation
Diffstat (limited to 'Documentation/git-annotate.txt')
| -rw-r--r-- | Documentation/git-annotate.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt index 8b6b56a544..0aba022ba6 100644 --- a/Documentation/git-annotate.txt +++ b/Documentation/git-annotate.txt @@ -14,6 +14,11 @@ DESCRIPTION Annotates each line in the given file with information from the commit which introduced the line. Optionally annotate from a given revision. +The only difference between this command and linkgit:git-blame[1] is that +they use slightly different output formats, and this command exists only +for backward compatibility to support existing scripts, and provide more +familiar command name for people coming from other SCM systems. + OPTIONS ------- include::blame-options.txt[] |