summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Revert "tweak manpage formatting"Junio C Hamano2007-08-101-13/+0
| | | | | | This reverts commit 524e5ffcf41a67ec113a9c3730ddc8fb8d3317f5. It is reported that this change breaks formatting with docbook 1.69.
* tweak manpage formattingJunio C Hamano2007-08-101-0/+13
| | | | | | | | This attempts to force fixed-font in manpages for literal blocks. I have tested this with docbook 1.71 and it seems to work as expected. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix an illustration in git-rev-parse.txtJunio C Hamano2007-08-101-1/+1
| | | | | | | | This hides the backslash at the end of line from AsciiDoc toolchain by introducing a trailing whitespace on one line in an illustration in git-rev-parse.txt. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix formatting of git-blame documentation.Junio C Hamano2007-08-101-10/+10
| | | | | | | blame-options.txt did not format multi-paragraph option description correctly. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Reorder the list of commands in the manual.Junio C Hamano2007-08-081-7/+9
| | | | | | | | The basic idea was proposed by Steve Hoelzer; in order to make the list easier to search, we keep the command list in the script that generates it with "sort -d". Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-stash documentation: add missing backtickSteve Hoelzer2007-08-071-1/+1
| | | | | Signed-off-by: Steve Hoelzer <shoelzer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-stash documentation: stash numbering starts at zero, not oneSteve Hoelzer2007-08-071-3/+3
| | | | | Signed-off-by: Steve Hoelzer <shoelzer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add a note about the index being updated by git-status in some casesSteven Grimm2007-08-061-0/+7
| | | | | Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/git-commit.txt: correct bad list formatting.David Kastrup2007-08-061-0/+1
| | | | | Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix "make GZ=1 quick-install-doc"Junio C Hamano2007-08-061-5/+3
| | | | | | | | The basic idea is from Mark Levedahl. I do not use GZ=1 nor quick-install-doc myself (there obviously is a chicken-and-egg issue with quick-install-doc for me). Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/git-svn: how to clone a git-svn-created repositoryAdam Roben2007-08-061-0/+20
| | | | | | | | These instructions tell you how to create a clone of a repository created with git-svn, that can in turn be used with git-svn. Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* documentation: use the word "index" in the git-commit man pageJ. Bruce Fields2007-08-051-14/+14
| | | | | | | | | | | As with git-add, I think previous updates to the git-commit man page did indeed help make it more user-friendly. But I think the banishment of the word "index" from the description goes too far; reinstate its use, to simplify some of the language slightly and smooth the transition to other documentation. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'master' of git://linux-nfs.org/~bfields/gitJunio C Hamano2007-08-052-35/+72
|\ | | | | | | | | | | | | | | * 'master' of git://linux-nfs.org/~bfields/git: documentation: use the word "index" in the git-add manual page user-manual: mention git-gui user-manual: mention git stash user-manual: update for new default --track behavior
| * Merge branch 'maint'J. Bruce Fields2007-08-051-19/+22
| |\
| | * documentation: use the word "index" in the git-add manual pageJ. Bruce Fields2007-08-051-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was a neat trick to show that you could introduce the git-add manual page without using the word "index", and it was certainly an improvement over the previous man page (which started out "A simple wrapper for git-update-index to add files to the index..."). But it's possible to use the standard terminology without sacrificing user-friendliness. So, rewrite to use the word "index" when appropriate. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * | user-manual: mention git-guiJ. Bruce Fields2007-08-051-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git gui project seems to be still in early stages, but at a point where it's worth mentioning as an alternative way of creating commits. One feature of interest is the ability to manipulate individual diff hunks. However, people have found that feature not to be easily discoverable from the user-interface. Pending some ui improvements, a parenthetical hint here may help. (Thanks to Steffen Prohask and Junio Hamano for suggesting the language.) Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * | user-manual: mention git stashJunio C Hamano2007-08-051-0/+32
| | | | | | | | | | | | | | | | | | | | | Mention the git-stash command as a way to temporarily set aside work in progress. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * | user-manual: update for new default --track behaviorJ. Bruce Fields2007-08-051-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to reflect the --track default. That change seems to have happened in the 1.5.3 -rc's, so bump the "for version x.y.z or newer" warning as well. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* | | Fix install-doc-quick targetJunio C Hamano2007-08-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script starts in a subdirectory of the source directory to muck with a branch whose structure does not have anything to do with the actual work tree. Go up to the top to make it clear that we operate on the whole tree. It also exported GIT_DIR without any good reason. Remove it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Fixed git-push manpageJyotirmoy Bhattacharya2007-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In git-push it is the remote repository and not the local repository which is fast forwarded. The description of the -f option in the git-push manpage gets it the other way round. Signed-off-by: Jyotirmoy Bhattacharya <jyotirmoy@jyotirmoy.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Document GIT_SSH environment variable alongside other variablesShawn O. Pearce2007-08-041-0/+16
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | The GIT_SSH environment variable has survived for quite a while without being documented, but has been mentioned on list and on my day-job repositories can only be accessed via magic supplied through the wonderous hack that is GIT_SSH. Advertising it alongside other "low level magic" such as GIT_PAGER and GIT_MERGE_VERBOSITY will certainly help others who need to spread their own pixie dust to make things work. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.3-rc4v1.5.3-rc4Junio C Hamano2007-08-031-3/+3
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fix documentation for core.gitproxy to reflect codeDavid Symonds2007-08-022-4/+2
| | | | | | | | | | | | | | | | The current implementation of core.gitproxy only operates on git:// URLs, so the ssh:// examples and custom protocol examples have been removed or edited. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | RelNotes 1.5.3 updates before -rc4Junio C Hamano2007-08-021-1/+13
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | When generating manpages, delete outdated targets first.David Kastrup2007-08-011-0/+1
| | | | | | | | | | | | | | | | This makes "make doc" work even if you made "sudo make doc" previously by mistake. Apparently an oversight: the other targets did this already. Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Try to be consistent with capitalization in the documentationSteve Hoelzer2007-08-014-26/+26
| | | | | | | | | | Signed-off-by: Steve Hoelzer <shoelzer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | --base-path-relaxed optionJens Axboe2007-08-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I switched git.kernel.dk to --base-path a few minutes ago, to get rid of a /data/git postfix in the posted urls. But transitioning is tricky, since now all old paths will fail miserably. So I added this --base-path-relaxed option, that will make git-daemon try the absolute path without prefixing --base-path before giving up. With this in place and --base-path-relaxed added, both my new url of git://git.kernel.dk/linux-2.6-block.git and the old git://git.kernel.dk/data/git/linux-2.6-block.git work fine. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Make verse of git-config manpage more readableAlex Riesen2007-07-311-13/+19
| | | | | | | | | | | | | | Also mention '--file' in FILES. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Add an option to specify a file to config builtinAlex Riesen2007-07-311-13/+16
| | | | | | | | | | | | | | | | | | There are (really!) systems where using environment variables is very cumbersome (yes, Windows, it has problems unsetting them). Besides this form is shorter. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/gitattributes.txt: typofixDavid Soria Parra2007-07-301-1/+1
| | | | | | | | | | | | | | The file used for per-repository attribute setting is not $GIT_DIR/info/gitattributes, but $GIT_DIR/info/attributes. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-diff: remove -r from --name-status exampleJeff King2007-07-281-5/+2
| | | | | | | | | | | | | | | | | | Calling 'git-diff --name-status' will recursively show any changes already, and it has for quite some time (at least as far back as v1.4.1). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Document commit.template configuration variable.Brian Gernhardt2007-07-262-3/+5
| | | | | | | | | | | | | | Add it to the list in config.txt and explicitly say that the --template option to git-commit overrides the configuration variable. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update description of -z option.Junio C Hamano2007-07-251-1/+3
| | | | | | | | | | | | | | The NUL you see in "git log" (without diff) output are between records, not at the end of each record. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Document --unified/-U optionRobin Rosenberg2007-07-251-0/+7
| | | | | | | | | | Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.3-rc3v1.5.3-rc3Junio C Hamano2007-07-251-3/+33
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | pretty-options.txt: tiny doc fixJim Meyering2007-07-251-2/+2
| | | | | | | | | | Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Teach git-commit about commit message templates.Steven Grimm2007-07-241-0/+8
| | | | | | | | | | | | | | | | | | | | These are useful in organizations that enforce particular formats for commit messages, e.g., to specify bug IDs or test plans. Use of the template is not enforced; it is simply used as the initial content when the editor is invoked. Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | user-manual: fix typolets.Junio C Hamano2007-07-241-4/+4
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Mark user-manual as UTF-8Junio C Hamano2007-07-242-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | There have been several complaints against k.org's user-manual page. The document is generated in ISO-8859-1 by the xsltproc toolchain (I suspect this is because released docbook.xsl we use has xsl:output element that says the output is ISO-8859-1) but server delivers it with "charset=UTF-8", and all h*ll breaks loose. This attempts to force UTF-8 on the generating end. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Teach revision machinery about --no-walkJohannes Schindelin2007-07-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag "no_walk" is present in struct rev_info since a long time, but so far has been in use exclusively by "git show". With this flag, you can see all your refs, ordered by date of the last commit: $ git log --abbrev-commit --pretty=oneline --decorate --all --no-walk which is extremely helpful if you have to juggle with a lot topic branches, and do not remember in which one you introduced that uber debug option, or simply want to get an overview what is cooking. (Note that the "git log" invocation above does not output the same as $ git show --abbrev-commit --pretty=oneline --decorate --all --quiet since "git show" keeps the alphabetic order that "--all" returns the refs in, even if the option "--date-order" was passed.) For good measure, this also adds the "--do-walk" option which overrides "--no-walk". Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | filter-branch: Big syntax change; support rewriting multiple refsJohannes Schindelin2007-07-231-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to take the first non-option argument as the name for the new branch. This syntax is not extensible to support rewriting more than just HEAD. Instead, we now have the following syntax: git filter-branch [<filter options>...] [<rev-list options>] All positive refs given in <rev-list options> are rewritten. Yes, in-place. If a ref was changed, the original head is stored in refs/original/$ref now, for your inspecting pleasure, in addition to the reflogs (since it is easier to inspect "git show-ref | grep original" than to inspect all the reflogs). This commit also adds the --force option to remove .git-rewrite/ and all refs from refs/original/ before filtering. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | fsck --lost-found: write blob's contents, not their SHA-1Johannes Schindelin2007-07-221-2/+4
| | | | | | | | | | | | | | | | | | | | When looking for a lost blob, it is much nicer to be able to grep through .git/lost-found/other/* than to write an inefficient loop over the file names. So write the contents of the dangling blobs, not their object names. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Synonyms: -i == --regexp-ignore-case, -E == --extended-regexpJunio C Hamano2007-07-221-3/+4
| | | | | | | | | | | | | | | | | | These options to log family were too long to type. Give them shorter synonyms. Fix the parsing of the long options while at it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/gitignore.txt: Fix the seriously misleading priority explanationDavid Kastrup2007-07-211-8/+14
| | | | | | | | | | Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fix VISUAL/EDITOR preference order in Documentation/config.txt.Junio C Hamano2007-07-211-2/+2
| | | | | | | | | | | | I screwed up when amending ef0c2abf. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Add GIT_EDITOR environment and core.editor configuration variablesAdam Roben2007-07-203-6/+16
| | | | | | | | | | | | | | | | | | | | | | These variables let you specify an editor that will be launched in preference to the EDITOR and VISUAL environment variables. The order of preference is GIT_EDITOR, core.editor, EDITOR, VISUAL. [jc: added a test and config variable documentation] Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Document how to tell git to not launch a pagerSteven Grimm2007-07-201-1/+3
| | | | | | | | | | Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Document "git stash message..."しらいしななこ2007-07-181-4/+7
| | | | | | | | | | | | | | | | The command was recently updated to take message on the command line, but this feature has not been documented. Signed-off-by: Nanako Shiraishi <nanako3@bluebottle.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint'Junio C Hamano2007-07-181-0/+6
|\ \ | |/ | | | | | | | | * maint: Force listingblocks to be monospaced in manpages Do not expect unlink(2) to fail on a directory.
| * Force listingblocks to be monospaced in manpagesJulian Phillips2007-07-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | For the html output we can use a stylesheet to make sure that the listingblocks are presented in a monospaced font. For the manpages do it manually by inserting a ".ft C" before and ".ft" after the block in question. In order for these roff commands to get through to the manpage they have to be element encoded to prevent quoting. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status