summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* GIT 1.6.1.2v1.6.1.2Junio C Hamano2009-01-291-0/+39
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'jc/maint-ls-tree' into maintJunio C Hamano2009-01-281-1/+7
|\ | | | | | | | | | | * jc/maint-ls-tree: Document git-ls-tree --full-tree ls-tree: add --full-tree option
| * Document git-ls-tree --full-treeNanako Shiraishi2009-01-011-1/+7
| | | | | | | | | | Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'np/no-loosen-prune-expire-now' into maintJunio C Hamano2009-01-281-1/+3
|\ \ | | | | | | | | | | | | * np/no-loosen-prune-expire-now: objects to be pruned immediately don't have to be loosened
| * | objects to be pruned immediately don't have to be loosenedNicolas Pitre2009-01-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is no grace period before pruning unreferenced objects, it is pointless to push those objects in their loose form just to delete them right away. Also be more explicit about the possibility of using "now" in the gc.pruneexpire config variable (needed for the above behavior to happen). Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | GIT 1.6.1.1v1.6.1.1Junio C Hamano2009-01-251-7/+17
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'am/maint-push-doc' into maintJunio C Hamano2009-01-231-7/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * am/maint-push-doc: Documentation: avoid using undefined parameters Documentation: mention branches rather than heads Documentation: remove a redundant elaboration Documentation: git push repository can also be a remote
| * | | Documentation: avoid using undefined parametersAnders Melchiorsen2009-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The <ref> parameter has not been introduced, so rewrite to avoid it. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Documentation: mention branches rather than headsAnders Melchiorsen2009-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "matching refs" semantics works only on matching branches these days. Instead of using "heads" which traditionally has been used more or less interchangeably with "refs", say "branch" explicitly here. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Documentation: remove a redundant elaborationAnders Melchiorsen2009-01-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment in parentheses is wrong, as one has to leave out both the colon and <dst>. This situation is covered by the section a few lines down: A parameter <ref> without a colon pushes the <ref> from the source repository to the destination repository under the same name. So, just remove the parentheses. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Documentation: git push repository can also be a remoteAnders Melchiorsen2009-01-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is copied from pull-fetch-param.txt and helps the reader to not get stuck in the URL section. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * maint-1.6.0: Fix Documentation for git-describe
| * | | | Fix Documentation for git-describeBoyd Stephen Smith Jr2009-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for git-describe says the default abbreviation is 8 hexadecimal digits while cache.c clearly shows DEFAULT_ABBREV set to 7. This patch corrects the documentation. Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin2009-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the other config variables use CamelCase. This config variable should not be an exception. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | shell: Document that 'cvs server' is a valid commandLars Noschinski2009-01-191-2/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | git-shell's man page explicitly lists all allowed commands, but 'cvs server' was missing. Add it. Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Update draft release notes for 1.6.1.1Junio C Hamano2009-01-171-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-172-2/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * maint-1.6.0: builtin-fsck: fix off by one head count Documentation: let asciidoc align related options githooks.txt: add missing word builtin-commit.c: do not remove COMMIT_EDITMSG
| * | | Documentation: let asciidoc align related optionsMarkus Heidelberg2009-01-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Command line options can share the same paragraph of description, if they are related or synonymous. In these cases they should be written among each other, so that asciidoc can format them itself. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | githooks.txt: add missing wordStephan Beyer2009-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Update draft release notes to 1.6.1.1Junio C Hamano2009-01-141-2/+23
| | | |
* | | | Merge branch 'mh/maint-sendmail-cc-doc' into maintJunio C Hamano2009-01-111-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * mh/maint-sendmail-cc-doc: doc/git-send-email: mention sendemail.cc config variable
| * | | | doc/git-send-email: mention sendemail.cc config variableMarkus Heidelberg2008-12-291-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable was added in 5f8b9fc (git-send-email: add a new sendemail.cc configuration variable, 2008-04-27), but is not yet refered to by the documentation. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Documentation/git-push.txt: minor: compress one optionjidanni@jidanni.org2009-01-111-3/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Be consistent in switch usage for tarHenrik Austad2009-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tar handles switches with and witout preceding '-', but the documentation should be consistent nonetheless. Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Use capitalized names where appropriateHenrik Austad2009-01-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Linux kernel and Emacs are both spelled capitalized Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Documentation/git-tag.txt: minor typo and grammar fixjidanni@jidanni.org2009-01-011-2/+2
| |_|/ |/| | | | | | | | | | | Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Prepare for v1.6.1.1 maintenance releaseJunio C Hamano2008-12-291-0/+23
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation/diff-options.txt: unify optionsjidanni@jidanni.org2008-12-291-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of listing short option (e.g. "-U<n>") as a shorthand for its longer counterpart (e.g. "--unified=<n>"), list the synonyms together. It saves one indirection to find what the reader wants. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-send-email.txt: move --format-patch paragraph to a proper locationAdeodato Simó2008-12-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | When introducing --format-patch, its documentation was accidentally inserted in the middle of documentation for --validate. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git-shortlog.txt: improve documentation about .mailmap filesAdeodato Simó2008-12-271-7/+33
|/ / | | | | | | | | | | | | | | | | | | The description on .mailmap made it seem like they are only useful for commits with a wrong address for an author, but they are about fixing the real name. Explain this better in the text, and replace the existing example with a new one that hopefully makes things clearer. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.6.1v1.6.1Junio C Hamano2008-12-242-0/+9
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.6.1-rc4v1.6.1-rc4Junio C Hamano2008-12-211-1/+18
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Make help entries alphabeticalRichard Hartmann2008-12-211-4/+4
| | | | | | | | | | Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint'Junio C Hamano2008-12-211-1/+2
|\ \ | |/ | | | | | | * maint: doc/git-fsck: change the way for getting heads' SHA1s
| * doc/git-fsck: change the way for getting heads' SHA1sMarkus Heidelberg2008-12-211-1/+2
| | | | | | | | | | | | | | | | | | The straightforward way with using 'cat .git/refs/heads/*' doesn't work with packed refs as well as branches of the form topic/topic1. So let's use git-for-each-ref for getting the heads' SHA1s in this example. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-revert documentation: refer to new HOWTO on reverting faulty mergesBoyd Stephen Smith Jr2008-12-211-0/+8
| | | | | | | | | | Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-show-branch: work around "single quote" typesetting glitchMarkus Heidelberg2008-12-211-1/+1
| | | | | | | | | | | | | | | | | | The displayed example is typeset with acute accents around the string that should be surrounded by a pair of single quotes in manpage. Replace them with double quotes (the semantics of the example does not change). Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Add a documentat on how to revert a faulty mergeNanako Shiraishi2008-12-211-0/+179
| | | | | | | | | | | | | | | | | | | | Linus and Junio explained issues that are involved in reverting a merge and how to continue working with a branch that was updated since such a revert on the mailing list. This is to help new people who did not see these messages. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg2008-12-191-1/+1
| | | | | | | | | | | | | | | | | | [jc: the original patch was against master but 99% of it applied to maint; this commit splits out the part that applies only to master.] Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano2008-12-1920-29/+107
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * GIT 1.6.0.6v1.6.0.6Junio C Hamano2008-12-194-0/+63
| |\ | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * GIT 1.5.6.6v1.5.6.6Junio C Hamano2008-12-163-0/+30
| | |\ | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | | * GIT 1.5.5.6v1.5.5.6Junio C Hamano2008-12-162-0/+20
| | | |\ | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | | | * GIT 1.5.4.7v1.5.4.7Junio C Hamano2008-12-161-0/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | fast-export: deal with tag objects that do not have a taggerJohannes Schindelin2008-12-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no tagger was found (old Git produced tags like this), no "tagger" line is printed (but this is incompatible with the current git fast-import). Alternatively, you can pass the option --fake-missing-tagger, forcing fast-export to fake a tagger Unspecified Tagger <no-tagger> with a tag date of the beginning of (Unix) time in the case of a missing tagger, so that fast-import is still able to import the result. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | SubmittingPatches: mention the usage of real name in Signed-off-by: linesMiklos Vajna2008-12-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially with something that is supposed to hopefully have some legal value down the line if somebody starts making noises, it really would be nice to have a real person to associate things with. Suggest this in the SubmittingPatches document. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg2008-12-1913-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Documentation: sync example output with git outputMarkus Heidelberg2008-12-194-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't confuse the user with old git messages. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Clarify documentation of "git checkout <tree-ish> paths" syntaxNanako Shiraishi2008-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SYNOPSIS section of the manual writes: git checkout [options] [<tree-ish>] [--] <paths>... but the DESCRIPTION says that this form checks the paths out "from the index, or from a named commit." A later sentence refers to the same argument as "<tree-ish> argument", but it is not clear that these two sentences are talking about the same command line argument for first-time readers. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | githooks documentation: add a note about the +x modeMiklos Vajna2008-12-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a freshly initialized repo it is only necessary to rename the .sample hooks, but when using older repos (initialized with older git init) enabled the +x mode is still necessary - docuement this. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status