development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ja/doc-style-fix'

Browse source 
Doc typo/stylo fixes.

* ja/doc-style-fix:
  doc: tidy asciidoc style
This commit is contained in:
Junio C Hamano 2019-02-05 14:26:16 -08:00
parent d243a323a5 ba170517be
commit 264def5ab7
14 changed files with 93 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/git-add.txt
View file

@ -58,7 +58,7 @@ OPTIONS
specifying `dir` will record not just a file `dir/file1`
modified in the working tree, a file `dir/file2` added to
the working tree, but also a file `dir/file3` removed from
the working tree. Note that older versions of Git used
the working tree). Note that older versions of Git used
to ignore removed files; use `--no-all` option if you want
to add modified or new files but ignore removed ones.
+

8
Documentation/git-cherry-pick.txt
View file

@ -218,11 +218,11 @@ information about the conflict is written to the index and
working tree and no new commit results.
<2> summarize changes to be reconciled
<3> cancel the cherry-pick. In other words, return to the
pre-cherry-pick state, preserving any local modifications you had in
the working tree.
pre-cherry-pick state, preserving any local modifications
you had in the working tree.
<4> try to apply the change introduced by `topic^` again,
spending extra time to avoid mistakes based on incorrectly matching
context lines.
spending extra time to avoid mistakes based on incorrectly
matching context lines.
SEE ALSO
--------

4
Documentation/git-reset.txt
View file

@ -171,8 +171,8 @@ $ git reset --hard HEAD~3 <1>
<1> The last three commits (`HEAD`, `HEAD^`, and `HEAD~2`) were bad
and you do not want to ever see them again. Do *not* do this if
you have already given these commits to somebody else. (See the
"RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for
the implications of doing so.)
"RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1]
for the implications of doing so.)
Undo a merge or pull::
+

1
Documentation/git-upload-pack.txt
View file

@ -22,7 +22,6 @@ The UI for the protocol is on the 'git fetch-pack' side, and the
program pair is meant to be used to pull updates from a remote
repository. For push operations, see 'git send-pack'.
OPTIONS
-------