зеркало из https://github.com/microsoft/git.git
Fix Documentation typos surrounding the word 'handful'.
Some instances replaced by "handful of", others use the word "few", a couple get a slight rewording. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
c2c5b27051
Коммит
323b9db839
|
@ -116,7 +116,7 @@ endif::git-format-patch[]
|
|||
--abbrev[=<n>]::
|
||||
Instead of showing the full 40-byte hexadecimal object
|
||||
name in diff-raw format output and diff-tree header
|
||||
lines, show only handful hexdigits prefix. This is
|
||||
lines, show only a partial prefix. This is
|
||||
independent of --full-index option above, which controls
|
||||
the diff-patch output format. Non default number of
|
||||
digits can be specified with --abbrev=<n>.
|
||||
|
|
|
@ -87,7 +87,7 @@ With something like git.git current tree, I get:
|
|||
v1.0.4-14-g2414721
|
||||
|
||||
i.e. the current head of my "parent" branch is based on v1.0.4,
|
||||
but since it has a handful commits on top of that,
|
||||
but since it has a few commits on top of that,
|
||||
describe has added the number of additional commits ("14") and
|
||||
an abbreviated object name for the commit itself ("2414721")
|
||||
at the end.
|
||||
|
|
|
@ -126,7 +126,7 @@ OPTIONS
|
|||
|
||||
--abbrev[=<n>]::
|
||||
Instead of showing the full 40-byte hexadecimal object
|
||||
lines, show only handful hexdigits prefix.
|
||||
lines, show only a partial prefix.
|
||||
Non default number of digits can be specified with --abbrev=<n>.
|
||||
|
||||
\--::
|
||||
|
|
|
@ -59,7 +59,7 @@ OPTIONS
|
|||
|
||||
--abbrev[=<n>]::
|
||||
Instead of showing the full 40-byte hexadecimal object
|
||||
lines, show only handful hexdigits prefix.
|
||||
lines, show only a partial prefix.
|
||||
Non default number of digits can be specified with --abbrev=<n>.
|
||||
|
||||
--full-name::
|
||||
|
|
|
@ -1243,10 +1243,10 @@ $ git ls-files --stage
|
|||
------------
|
||||
|
||||
In our example of only two files, we did not have unchanged
|
||||
files so only 'example' resulted in collapsing, but in real-life
|
||||
large projects, only small number of files change in one commit,
|
||||
and this 'collapsing' tends to trivially merge most of the paths
|
||||
fairly quickly, leaving only a handful the real changes in non-zero
|
||||
files so only 'example' resulted in collapsing. But in real-life
|
||||
large projects, when only a small number of files change in one commit,
|
||||
this 'collapsing' tends to trivially merge most of the paths
|
||||
fairly quickly, leaving only a handful of real changes in non-zero
|
||||
stages.
|
||||
|
||||
To look at only non-zero stages, use `\--unmerged` flag:
|
||||
|
|
|
@ -15,7 +15,7 @@ DESCRIPTION
|
|||
|
||||
Hooks are little scripts you can place in `$GIT_DIR/hooks`
|
||||
directory to trigger action at certain points. When
|
||||
'git-init' is run, a handful example hooks are copied in the
|
||||
'git-init' is run, a handful of example hooks are copied into the
|
||||
`hooks` directory of the new repository, but by default they are
|
||||
all disabled. To enable a hook, rename it by removing its `.sample`
|
||||
suffix.
|
||||
|
|
|
@ -27,7 +27,7 @@ the kind of task StGIT is designed to do.
|
|||
I just have done a simpler one, this time using only the core
|
||||
GIT tools.
|
||||
|
||||
I had a handful commits that were ahead of master in pu, and I
|
||||
I had a handful of commits that were ahead of master in pu, and I
|
||||
wanted to add some documentation bypassing my usual habit of
|
||||
placing new things in pu first. At the beginning, the commit
|
||||
ancestry graph looked like this:
|
||||
|
|
|
@ -10,7 +10,7 @@ configuration (see linkgit:git-config[1]).
|
|||
|
||||
--abbrev-commit::
|
||||
Instead of showing the full 40-byte hexadecimal commit object
|
||||
name, show only handful hexdigits prefix. Non default number of
|
||||
name, show only a partial prefix. Non default number of
|
||||
digits can be specified with "--abbrev=<n>" (which also modifies
|
||||
diff output, if it is displayed).
|
||||
+
|
||||
|
|
Загрузка…
Ссылка в новой задаче