Re: [PATCH] Added documentation for few missing options.
- From
Junio C Hamano <junkio@cox.net>
- Date
- Dec 6, 2005, 06:10 UTC
- Message-ID
- <7vd5ka7o38.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <E1EjV8R-00014y-Sg@jdl.com>
Jon Loeliger <jdl@freescale.com> writes:
Show 6 quoted lines
> More $ shell prompts in examples. > Minor English grammar improvements. > Added a few "See Also"s. > Use back-ticks on more command examples. > > Signed-off-by: Jon Loeliger <jdl@freescale.com>
Thanks. You deserve to add your own name to the Documentation section ;-).
Mostly note to myself...
Show 7 quoted lines
> +EXAMPLES > +-------- > +To update and refresh only the files already checked out:: > ++ > +---------------- > +$ git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh > +----------------
These days, "git-checkout-index -n -u -f -a" may a preferred equivalent of the above.
> +OPTIONS > +------- > +--template=<template_directory>:: > + Provide the directory in from which templates will be used.
? "use templates stored in the named directory" ?
Show 11 quoted lines
> @@ -220,8 +222,8 @@ populated. Here is an outline of how th > matching "stage1" entry if it exists too. .. all the normal > trivial rules .. > > -You would normally use "git-merge-index" with supplied > -"git-merge-one-file" to do this last step. The script > +You would normally use `git-merge-index` with supplied > +`git-merge-one-file` to do this last step. The script > does not touch the files in the work tree, and the entire merge > happens in the index file. In other words, there is no need to > worry about what is in the working directory, since it is never
The above paragraph is way out of date, as of beginning of June 2005. The current merge-one-file does smudge the working tree during the merge. I'll rewrite it.