Skip to content

Commit d8a1bac

Browse files
committed
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
2 parents bd62e7c + 246090a commit d8a1bac

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

Documentation/git-blame.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Apart from supporting file annotation, Git also supports searching the
3535
development history for when a code snippet occurred in a change. This makes it
3636
possible to track when a code snippet was added to a file, moved or copied
3737
between files, and eventually deleted or replaced. It works by searching for
38-
a text string in the diff. A small example:
38+
a text string in the diff. A small example of the pickaxe interface
39+
that searches for `blame_usage`:
3940

4041
-----------------------------------------------------------------------------
4142
$ git log --pretty=oneline -S'blame_usage'

Documentation/git-clone.txt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,12 @@ repository is specified as a URL, then this flag is ignored (and we
5555
never use the local optimizations). Specifying `--no-local` will
5656
override the default when `/path/to/repo` is given, using the regular
5757
Git transport instead.
58-
+
59-
To force copying instead of hardlinking (which may be desirable if you
60-
are trying to make a back-up of your repository), but still avoid the
61-
usual "Git aware" transport mechanism, `--no-hardlinks` can be used.
6258

6359
--no-hardlinks::
64-
Optimize the cloning process from a repository on a
65-
local filesystem by copying files under `.git/objects`
66-
directory.
60+
Force the cloning process from a repository on a local
61+
filesystem to copy the files under the `.git/objects`
62+
directory instead of using hardlinks. This may be desirable
63+
if you are trying to make a back-up of your repository.
6764

6865
--shared::
6966
-s::

Documentation/git-remote.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ git-remote(1)
33

44
NAME
55
----
6-
git-remote - manage set of tracked repositories
6+
git-remote - Manage set of tracked repositories
77

88

99
SYNOPSIS

Documentation/merge-strategies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ recursive::
2020
merged tree of the common ancestors and uses that as
2121
the reference tree for the 3-way merge. This has been
2222
reported to result in fewer merge conflicts without
23-
causing mis-merges by tests done on actual merge commits
23+
causing mismerges by tests done on actual merge commits
2424
taken from Linux 2.6 kernel development history.
2525
Additionally this can detect and handle merges involving
2626
renames. This is the default merge strategy when

0 commit comments

Comments
 (0)