From: Junio C Hamano Date: Thu, 8 Jun 2006 00:27:09 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Tag: v1.4.1-rc1~31 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ab1b3af7925682e0375667b892e2f7e985effba5?hp=-c Merge branch 'master' into next * master: Documentation: git aliases git-cvsserver asciidoc formatting tweaks config.txt grammar, typo, and asciidoc fixes Documentation: git-ls-tree (typofix) Document git-ls-tree --fullname Document git aliases support make clean: remove dist-doc targets. Misc doc improvements Documentation: add missing docs make check-docs found. Some doc typo fixes Off-by-one error in get_path_prefix(), found by Valgrind gitk: Re-read the descendent/ancestor tag & head info on update --- ab1b3af7925682e0375667b892e2f7e985effba5 diff --combined Documentation/git-read-tree.txt index 1c01d00df2,d894f537ba..11bd9c0adc --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@@ -8,7 -8,7 +8,7 @@@ git-read-tree - Reads tree information SYNOPSIS -------- -'git-read-tree' ( | [[-m [--aggressive]| --reset] [-u | -i]] [ []]) +'git-read-tree' ( | [[-m [--aggressive] | --reset | --prefix=] [-u | -i]] [ []]) DESCRIPTION @@@ -63,15 -63,6 +63,15 @@@ OPTION * when both sides adds a path identically. The resolution is to add that path. +--prefix=/:: + Keep the current index contents, and read the contents + of named tree-ish under directory at ``. The + original index file cannot have anything at the path + `` itself, and have nothing in `/` + directory. Note that the `/` value must end + with a slash. + + :: The id of the tree object(s) to be read/merged. @@@ -266,7 -257,7 +266,7 @@@ file that does not match stage 2 This is done to prevent you from losing your work-in-progress changes, and mixing your random changes in an unrelated merge commit. To illustrate, suppose you start from what has been - commited last to your repository: + committed last to your repository: ---------------- $ JC=`git-rev-parse --verify "HEAD^0"`