summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Install asciidoc sources as well.Junio C Hamano2005-11-061-2/+2
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: pull/clone ref mapping clarification.Junio C Hamano2005-11-062-14/+33
| | | | | | | | | Josef Weidendorfer points out that git-clone documentation does not mention the initial copying of remote branch heads into corresponding local branches. Also clarify the purpose of the ref mappings description in the "remotes" file and recommended workflow. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: format-patchJunio C Hamano2005-11-051-0/+20
| | | | | | | Add examples section and talk about using this to cherry-pick commits. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-fetch/pull updates.Junio C Hamano2005-11-054-4/+30
| | | | | | | | | | | | | | We do not accept multiple <refspecs> on one Pull:/Push: line right now (we could lift this tentative workaround for the broken refnames), but we have always accepted multiple such lines, so use that form in the examples and discussion. Also explicitly mention that Octopus is made only with an explicit command line request and never from Pull: lines. Add a couple of cross references. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Added a few examples to git-pull man page.Jon Loeliger2005-11-042-32/+103
| | | | | | | | | | | | | | Clarified and added notes for pull/push refspecs. Converted to back-ticks for literal text examples. [jc: Also fixed git-pull description that still talked about its calling git-resolve or git-octopus (we do not anymore; instead we just call git-merge). BTW, I am reasonably impressed by how well "git-am -3" applied this patch, which had some conflicts because I've updated the documentation somewhat.] Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the --no-commit flag betterJunio C Hamano2005-11-041-1/+2
| | | | | | | | Pasky and I did overlapping documentation independently; this is to pick up better wordings from what he sent me. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: -merge and -pull: describe merge strategies.Junio C Hamano2005-11-044-11/+88
| | | | | | | ... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-add -- do not say "cache", add examples.Junio C Hamano2005-11-041-4/+39
| | | | | | | Its use of git-ls-files --others is very nice, but sometimes gives surprising results, so we'd better talk about it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Illustration: "Commit DAG Revision Naming"Junio C Hamano2005-11-031-0/+26
| | | | | | Jon Loeliger's ASCII art in the git-rev-parse(1) manual. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Illustration: "Git Diff Types"Junio C Hamano2005-11-031-0/+35
| | | | | | Jon Loeliger's ASCII art in the Tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document --since and --until options to rev-parse.Junio C Hamano2005-11-021-0/+8
| | | | | | | The usability magic were hidden in the source code without being documented, and even the maintainer did not know about them ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add -P to the documentation head.Junio C Hamano2005-11-011-1/+1
| | | | | | | This is a companion patch for 211dcac6430cdf77fcf2a968ffaf9313b5c059b0 commit, to add the newly introduced -P option to the list of options. Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: introduce -P <cvsps-output-file> optionMartin Langhoff2005-11-011-0/+4
| | | | | | | | | -P:: <cvsps-output-file> Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am.txt is no stub anymorePetr Baudis2005-11-011-2/+0
| | | | | | | | | That notice was added by me for the emergency documentation, but Junio already expanded it to a full-fledged manual page. This patch removes the notice. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation for git-fmt-merge-msgPetr Baudis2005-11-012-0/+49
| | | | | | | | | | Simple description. It appears to be mostly internal command, but hey, it is (it seems) the only undocumented one, so let's fix it up... Also add a note about it to git-merge documentation. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove 'Previously this command was known as ...' messages.Jon Loeliger2005-11-011-44/+0
| | | | | | | | | | For a 1.0 release, there is no need to maintain the historical "Previously this command was known as..." information on the doc splash page. It is noise; command names should stand on their own now. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the use of "current directory" as pull source.Junio C Hamano2005-11-012-1/+6
| | | | | | | | The repository to pull from can be a local repository, and as a special case the current directory can be specified to perform merges across local branches. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add examples for git-log documentation and others.Linus Torvalds2005-10-303-0/+45
| | | | | | | | | | | | | | | | | | | I don't think people really follow the links or think very abstractly at all in the first place. So I was thinking more of some explicit examples. I actually think every command should have an example in the man-page, and hey, here's a patch to start things off. Of course, I'm not exactly "Mr Documentation", and I don't know that this is the prettiest way to do this, but I checked that the resulting html and man-page seems at least reasonable. And hey, if the examples look like each other, that's just because I'm also not "Mr Imagination". Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix rev-list documentation again (--sparse and pathspec)Junio C Hamano2005-10-301-4/+5
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-pack-objects documentation.Junio C Hamano2005-10-301-1/+6
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update usage string and documentation for git-rev-list.Junio C Hamano2005-10-301-4/+51
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add to usage and docs for git-add.shChris Shoemaker2005-10-301-1/+8
| | | | | Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add to documentation of git-update-index arguments and usage.Chris Shoemaker2005-10-301-7/+24
| | | | | | | Removed unknown [--version] option. Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation updates.Junio C Hamano2005-10-293-7/+59
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix recent documentation format breakage.Junio C Hamano2005-10-291-6/+6
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-apply --numstatJunio C Hamano2005-10-281-1/+7
| | | | | | | | | The new option, --numstat, shows number of inserted and deleted lines for each path. It is similar to --stat output but is meant to be more machine friendly by giving number of added and deleted lines and unabbreviated paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Minor clarifications in diffcore documentationc.shoemaker@cox.net2005-10-281-27/+38
| | | | | Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove -r from common diff options documentation in one more placec.shoemaker@cox.net2005-10-281-4/+0
| | | | | Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation changes to recursive option for git-diff-treeChris Shoemaker2005-10-281-1/+4
| | | | | | | | | | Update docs and usages regarding '-r' recursive option for git-diff-tree. Remove '-r' from common diff options, mention it only for git-diff-tree. Remove one extraneous use of '-r' with git-diff-files in get-merge.sh. Sync the synopsis and usage string for git-diff-tree. Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document git-patch-id a bit better.Junio C Hamano2005-10-281-0/+6
| | | | | | | | | Pavel Roskin wondered what the SHA1 output at the beginning of git-diff-tree was about. The only consumer of that information so far is this git-patch-id command, which was inadequately documented. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Link git-name-rev and git-symbolic-ref from the main git pageJohannes Schindelin2005-10-281-0/+6
| | | | | | | According to my checks, these were the only commands not yet linked. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add git-name-revJohannes Schindelin2005-10-261-0/+66
| | | | | | | | | | | | | | | git-name-rev tries to find nice symbolic names for commits. It does so by walking the commits from the refs. When the symbolic name is ambiguous, the following heuristic is applied: Try to avoid too many ~'s, and if two ambiguous names have the same count of ~'s, take the one whose last number is smaller. With "--tags", the names are derived only from tags. With "--stdin", the stdin is parsed, and after every sha1 for which a name could be found, the name is appended. (Try "git log | git name-rev --stdin".) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am: make it easier after fixing up an unapplicable patch.Junio C Hamano2005-10-251-4/+4
| | | | | | | Instead of having the user to edit the mail message, let the hand merge result stored in .dotest/patch and continue, which is easier to manage. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add some missing commands to the git.txt commands listPetr Baudis2005-10-251-0/+18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation for git-shellPetr Baudis2005-10-252-0/+38
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add git-mvJosef Weidendorfer2005-10-231-0/+51
| | | | | | | | | | | | | | | | It supersedes git-rename by adding functionality to move multiple files, directories or symlinks into another directory. It also provides according documentation. The implementation renames multiple files, using the arguments from the command line to produce an array of sources and destinations. In a first pass, all requested renames are checked for errors, and overwriting of existing files is only allowed with '-f'. The actual renaming is done in a second pass. This ensures that any error condition is checked before anything is changed. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix malformatted git-am documentation.Junio C Hamano2005-10-211-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-daemon's documentation wrt. new optionsPetr Baudis2005-10-201-2/+20
| | | | | | | | | New options --timeout, --init-timeout, --export-all and whitelist support were added to git-daemon, but noone bothered to also add the proper documentation. This patch aims to fix that. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Finish git-am documentation.Junio C Hamano2005-10-201-10/+49
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Brief documentation for the mysterious git-am scriptPetr Baudis2005-10-202-1/+52
| | | | | | | | | | | | | The git-am script is nowhere called and nowhere (including itself) explained, and the name isn't helpful either. For those like me who will wonder what is it about, add some documentation stub for it to the documentation. I probably got something wrong and I don't feel like investigating all the options - this is just kind of "emergency" docs. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-fetch/push/pull: documentation.Junio C Hamano2005-10-194-10/+18
| | | | | | | | | The documentation was lazily sharing the argument description across these commands. Lazy may be a way of life, but that does not justify confusing others ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone: always keep pack sent from remote (documentation).Junio C Hamano2005-10-191-12/+3
| | | | | | This adjusts the documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-checkout: revert specific paths to either index or a given tree-ish.Junio C Hamano2005-10-181-3/+39
| | | | | | | | | | When extra paths arguments are given, git-checkout reverts only those paths to either the version recorded in the index or the version recorded in the given tree-ish. This has been on the TODO list for quite a while. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-apply: remove unused --show-files flag.Junio C Hamano2005-10-171-4/+1
| | | | | | | Linus says he does not use it (and the thinking behind its initial introduction), and neither Cogito nor StGIT uses it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update documentation for C-style quoting.Junio C Hamano2005-10-174-2/+33
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'fixes'Junio C Hamano2005-10-171-13/+7
|\
| * git-checkout-index: documentation updates.Junio C Hamano2005-10-171-13/+7
| | | | | | | | | | | | Now the behaviour of '-a' has been straightened out, document it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | ref-format documentation.Junio C Hamano2005-10-162-2/+65
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fixes'Junio C Hamano2005-10-161-0/+7
|\ \ | |/
| * whatchanged: document -m option from git-diff-tree.Junio C Hamano2005-10-151-0/+7
| | | | | | | | | | | | | | | | | | The documentation for git-whatchanged is meant to describe only the most frequently used options from git-diff-tree. Because "why doesn't it show merges" was asked more than once, we'd better describe '-m' option there. Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status