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 | |
| parent | bd62e7c364fcce7f42862e3aebedffb1c7e24136 (diff) | |
| parent | 246090a5d0ff3a51df8fed676e8159c3776c954a (diff) | |
| download | git-d8a1bac1d49dfe8879000e2bd07d138d3088f5b4.tar.gz git-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')
| -rw-r--r-- | Documentation/git-blame.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-clone.txt | 11 | ||||
| -rw-r--r-- | Documentation/git-remote.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-strategies.txt | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 8e70a6184..9f23a861c 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' diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index bf3dac0ce..0363d0039 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -55,15 +55,12 @@ repository is specified as a URL, then this flag is ignored (and we never use the local optimizations). Specifying `--no-local` will override the default when `/path/to/repo` is given, using the regular Git transport instead. -+ -To force copying instead of hardlinking (which may be desirable if you -are trying to make a back-up of your repository), but still avoid the -usual "Git aware" transport mechanism, `--no-hardlinks` can be used. --no-hardlinks:: - Optimize the cloning process from a repository on a - local filesystem by copying files under `.git/objects` - directory. + Force the cloning process from a repository on a local + filesystem to copy the files under the `.git/objects` + directory instead of using hardlinks. This may be desirable + if you are trying to make a back-up of your repository. --shared:: -s:: diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 2507c8bd9..cb103c8b6 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -3,7 +3,7 @@ git-remote(1) NAME ---- -git-remote - manage set of tracked repositories +git-remote - Manage set of tracked repositories SYNOPSIS diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index fb6e593e7..350949810 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -20,7 +20,7 @@ recursive:: merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without - causing mis-merges by tests done on actual merge commits + causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving renames. This is the default merge strategy when |