diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:43 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:43 -0800 |
commit | d8a1bac1d49dfe8879000e2bd07d138d3088f5b4 (patch) | |
tree | 653472a67905cd986e426f3149d0996dff6262b1 /Documentation/git-blame.txt | |
parent | Merge branch 'jk/test-ports' (diff) | |
parent | docs/git-blame: explain more clearly the example pickaxe use (diff) | |
download | tgif-d8a1bac1d49dfe8879000e2bd07d138d3088f5b4.tar.xz |
Merge branch 'al/docs'
A handful of documentation updates, all trivially harmless.
* al/docs:
docs/git-blame: explain more clearly the example pickaxe use
docs/git-clone: clarify use of --no-hardlinks option
docs/git-remote: capitalize first word of initial blurb
docs/merge-strategies: remove hyphen from mis-merges
Diffstat (limited to 'Documentation/git-blame.txt')
-rw-r--r-- | Documentation/git-blame.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 8e70a61840..9f23a861ce 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -35,7 +35,8 @@ Apart from supporting file annotation, Git also supports searching the development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for -a text string in the diff. A small example: +a text string in the diff. A small example of the pickaxe interface +that searches for `blame_usage`: ----------------------------------------------------------------------------- $ git log --pretty=oneline -S'blame_usage' |