kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

doc: tidy asciidoc style 

This mainly refers to enforcing indentation on additional lines of
items of lists.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jean-Noël Avila 2019-01-22 21:16:35 +01:00 committed by Junio C Hamano
parent 0d0ac3826a
commit ba170517be
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` specifying `dir` will record not just a file `dir/file1`
modified in the working tree, a file `dir/file2` added to 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, 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 ignore removed files; use `--no-all` option if you want
to add modified or new files but ignore removed ones. 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. working tree and no new commit results.
<2> summarize changes to be reconciled <2> summarize changes to be reconciled
<3> cancel the cherry-pick. In other words, return to the <3> cancel the cherry-pick. In other words, return to the
pre-cherry-pick state, preserving any local modifications you had in pre-cherry-pick state, preserving any local modifications
the working tree. you had in the working tree.
<4> try to apply the change introduced by `topic^` again, <4> try to apply the change introduced by `topic^` again,
spending extra time to avoid mistakes based on incorrectly matching spending extra time to avoid mistakes based on incorrectly
context lines. matching context lines.


SEE ALSO 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 <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 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 you have already given these commits to somebody else. (See the
"RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for "RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1]
the implications of doing so.) for the implications of doing so.)


Undo a merge or pull:: 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 program pair is meant to be used to pull updates from a remote
repository. For push operations, see 'git send-pack'. repository. For push operations, see 'git send-pack'.



OPTIONS OPTIONS
------- -------