From: Junio C Hamano Date: Wed, 4 Nov 2015 22:20:49 +0000 (-0800) Subject: Merge branch 'xf/user-manual-ff' into maint X-Git-Tag: v2.6.3~11 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/684fea37948d720cc69b3553b42353b4b42709dc?hp=-c Merge branch 'xf/user-manual-ff' into maint * xf/user-manual-ff: user-manual: fix the description of fast-forward --- 684fea37948d720cc69b3553b42353b4b42709dc diff --combined Documentation/user-manual.txt index 764a270c83,f61f91fd32..1c790ac74a --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@@ -1200,7 -1200,7 +1200,7 @@@ for other users who clone your reposito If you wish the exclude patterns to affect only certain repositories (instead of every repository for a given project), you may instead put them in a file in your repository named `.git/info/exclude`, or in any -file specified by the `core.excludesfile` configuration variable. +file specified by the `core.excludesFile` configuration variable. Some Git commands can also take exclude patterns directly on the command line. See linkgit:gitignore[5] for the details. @@@ -1431,11 -1431,11 +1431,11 @@@ differently. Normally, a merge result parents, one pointing at each of the two lines of development that were merged. - However, if the current branch is a descendant of the other--so every - commit present in the one is already contained in the other--then Git - just performs a "fast-forward"; the head of the current branch is moved - forward to point at the head of the merged-in branch, without any new - commits being created. + However, if the current branch is an ancestor of the other--so every commit + present in the current branch is already contained in the other branch--then Git + just performs a "fast-forward"; the head of the current branch is moved forward + to point at the head of the merged-in branch, without any new commits being + created. [[fixing-mistakes]] Fixing mistakes @@@ -1491,7 -1491,7 +1491,7 @@@ resolving a merge>> [[fixing-a-mistake-by-rewriting-history]] Fixing a mistake by rewriting history -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If the problematic commit is the most recent commit, and you have not yet made that commit public, then you may just @@@ -3424,7 -3424,7 +3424,7 @@@ just missing one particular blob versio [[the-index]] The index ------------ +--------- The index is a binary file (generally kept in `.git/index`) containing a sorted list of path names, each with permissions and the SHA-1 of a blob @@@ -4230,9 -4230,9 +4230,9 @@@ Most of what `git rev-list` did is cont 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()`.