From 13f72a1d5faacfdfea43e2fd961cb4009206a605 Mon Sep 17 00:00:00 2001 From: "Albert L. Lash, IV" Date: Sat, 8 Feb 2014 15:41:34 -0500 Subject: [PATCH 1/4] docs/merge-strategies: remove hyphen from mis-merges The term mismerges without hyphen is used a few other places in the documentation. Let's update this to be consistent. Signed-off-by: Albert L. Lash, IV Signed-off-by: Junio C Hamano --- Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From a2f69581ffc26fadb27bc29dd03074791a16d61e Mon Sep 17 00:00:00 2001 From: "Albert L. Lash, IV" Date: Sat, 8 Feb 2014 15:41:35 -0500 Subject: [PATCH 2/4] docs/git-remote: capitalize first word of initial blurb All other man files have capitalized descriptions which immediately follow the command's name. Let's capitalize this one too for consistency. Signed-off-by: Albert L. Lash, IV Signed-off-by: Junio C Hamano --- Documentation/git-remote.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 897e3e454062d2bb9d3c1e4068caf4971fd713ff Mon Sep 17 00:00:00 2001 From: "Albert L. Lash, IV" Date: Sat, 8 Feb 2014 15:41:36 -0500 Subject: [PATCH 3/4] docs/git-clone: clarify use of --no-hardlinks option Current text claims optimization, implying the use of hardlinks, when this option ratchets down the level of efficiency. This change explains the difference made by using this option, namely copying instead of hardlinking, and why it may be useful. Signed-off-by: Albert L. Lash, IV Signed-off-by: Junio C Hamano --- Documentation/git-clone.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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:: From 246090a5d0ff3a51df8fed676e8159c3776c954a Mon Sep 17 00:00:00 2001 From: "Albert L. Lash, IV" Date: Sat, 8 Feb 2014 15:41:37 -0500 Subject: [PATCH 4/4] docs/git-blame: explain more clearly the example pickaxe use We state that the following paragraph mentions the pickaxe interface, but the term pickaxe is not then used. This change clarifies that the example command uses the pickaxe interface and what it is searching for. Signed-off-by: Albert L. Lash, IV Signed-off-by: Junio C Hamano --- Documentation/git-blame.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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'