undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'al/docs'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2014-02-27 14:01:43 -08:00
commit d8a1bac1d4
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-blame.txt
View File

@ -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 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 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 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' $ git log --pretty=oneline -S'blame_usage'

11
Documentation/git-clone.txt
View File

@ -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 never use the local optimizations). Specifying `--no-local` will
override the default when `/path/to/repo` is given, using the regular override the default when `/path/to/repo` is given, using the regular
Git transport instead. 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:: --no-hardlinks::
Optimize the cloning process from a repository on a Force the cloning process from a repository on a local
local filesystem by copying files under `.git/objects` filesystem to copy the files under the `.git/objects`
directory. directory instead of using hardlinks. This may be desirable
if you are trying to make a back-up of your repository.
--shared:: --shared::
-s:: -s::

2
Documentation/git-remote.txt
View File

@ -3,7 +3,7 @@ git-remote(1)
NAME NAME
---- ----
git-remote - manage set of tracked repositories git-remote - Manage set of tracked repositories
SYNOPSIS SYNOPSIS

2
Documentation/merge-strategies.txt
View File

@ -20,7 +20,7 @@ recursive::
merged tree of the common ancestors and uses that as merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without 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. taken from Linux 2.6 kernel development history.
Additionally this can detect and handle merges involving Additionally this can detect and handle merges involving
renames. This is the default merge strategy when renames. This is the default merge strategy when