summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-06 11:38:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-06 11:38:48 -0700
commited47bbd1d05ce7f78a52639e1b1fb522b975b066 (patch)
treef34673c4d03b285bd8d4ffc5555c2e98fb757141 /Documentation/user-manual.txt
parentMerge branch 'jc/coding-guidelines' (diff)
parentDocumentation: use "command-line" when used as a compound adjective, and fix ... (diff)
downloadtgif-ed47bbd1d05ce7f78a52639e1b1fb522b975b066.tar.xz
Merge branch 'jj/command-line-adjective'
* jj/command-line-adjective: Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 022e74e616..d33f8849b5 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4231,9 +4231,9 @@ Most of what `git rev-list` did is contained in `revision.c` and
controls how and what revisions are walked, and more.
The original job of `git rev-parse` is now taken by the function
-`setup_revisions()`, which parses the revisions and the common command line
+`setup_revisions()`, which parses the revisions and the common command-line
options for the revision walker. This information is stored in the struct
-`rev_info` for later consumption. You can do your own command line option
+`rev_info` for later consumption. You can do your own command-line option
parsing after calling `setup_revisions()`. After that, you have to call
`prepare_revision_walk()` for initialization, and then you can get the
commits one by one with the function `get_revision()`.