X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=fc1874424e26a2f95574d72bf3fc1c71a3b1a1b6;hb=d9f405931fa3d96b2a80fe5ad8205eea7c443f56;hp=d99fa199d65edb56838cfbd6944a2d681b45615b;hpb=06ada1529ce46e84aaef4e5608c1101c1c7ec73f;p=git.git diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index d99fa199d..fc1874424 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -281,7 +281,7 @@ This commit is referred to as a "merge commit", or sometimes just a [[def_pickaxe]]pickaxe:: The term <> refers to an option to the diffcore routines that help select changes that add or delete a given text - string. With the --pickaxe-all option, it can be used to view the full + string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a particular line of text. See gitlink:git-diff[1]. @@ -301,8 +301,8 @@ This commit is referred to as a "merge commit", or sometimes just a [[def_push]]push:: Pushing a <> means to get the branch's <> from a remote <>, - find out if it is an ancestor to the branch's local - head ref is a direct, and in that case, putting all + find out if it is a direct ancestor to the branch's local + head ref, and in that case, putting all objects, which are <> from the local head ref, and which are missing from the remote repository, into the remote