summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2012-12-131-0/+1
|\
| * git.txt: add missing info about --git-dir command-line optionManlio Perillo2012-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | Unlike other environment variables (e.g. GIT_WORK_TREE, GIT_NAMESPACE), the Documentation/git.txt file did not mention that the GIT_DIR environment variable can also be set using the --git-dir command line option. Signed-off-by: Manlio Perillo <manlio.perillo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'mh/doc-remote-helpers'Junio C Hamano2012-12-131-105/+140
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * mh/doc-remote-helpers: git-remote-helpers.txt: clarify options & ref list attributes git-remote-helpers.txt: clarify command <-> capability correspondences git-remote-helpers.txt: rearrange description of capabilities git-remote-helpers.txt: minor grammar fix git-remote-helpers.txt: document missing capabilities git-remote-helpers.txt: document invocation before input format
| * | git-remote-helpers.txt: clarify options & ref list attributesMax Horn2012-12-071-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation was misleading in that it gave the impression that 'for-push' could be used as a ref attribute in the output of the 'list' command. That is wrong. Also, explicitly point out the connection between the commands 'list' and 'options' on the one hand, and the sections 'REF LIST ATTRIBUTES' and 'OPTIONS' on the other hand. Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git-remote-helpers.txt: clarify command <-> capability correspondencesMax Horn2012-12-071-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, document 'list for-push' separately from 'list', as the former needs only be supported for the push/export capabilities, and the latter only for fetch/import. Indeed, a hypothetically 'push-only' helper would only need to support the former, not the latter. Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git-remote-helpers.txt: rearrange description of capabilitiesMax Horn2012-12-071-78/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | This also remove some duplication in the descriptions (e.g. refspec was explained twice with similar level of detail). Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git-remote-helpers.txt: minor grammar fixMax Horn2012-12-071-3/+3
| | | | | | | | | | | | | | | | | | Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git-remote-helpers.txt: document missing capabilitiesMax Horn2012-12-071-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, document the 'export' and '(im|ex)port-marks' capabilities as well as the export command, which were undocumented (but in active use). Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git-remote-helpers.txt: document invocation before input formatMax Horn2012-12-071-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the distant past, the order things were documented was 'Invocation', 'Commands', 'Capabilities', ... Then it was decided that before giving a list of Commands, there should be an overall description of the 'Input format', which was a wise decision. However, this description was put as the very first thing, with the rationale that any implementor would want to know that first. However, it seems an implementor would actually first need to know how the remote helper will be invoked, so moving 'Invocation' to the front again seems logical. Moreover, we now don't switch from discussing the input format to the invocation style and then back to input related stuff. Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git(1): show link to contributor summary pageJunio C Hamano2012-12-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | We earlier removed a link to list of contributors that pointed to a defunct page; let's use a working one from Ohloh.net to replace it instead. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.8.0.2Junio C Hamano2012-12-102-4/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * maint: Git 1.8.0.2 Documentation/git-stash.txt: add a missing verb git(1): remove a defunct link to "list of authors" Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Git 1.8.0.2v1.8.0.2Junio C Hamano2012-12-101-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Documentation/git-stash.txt: add a missing verbSébastien Loriot2012-12-101-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Sébastien Loriot <sloriot.ml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | git(1): remove a defunct link to "list of authors"Junio C Hamano2012-12-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The linked page has not been showing the promised "more complete list" for more than 6 months by now, and nobody has resurrected the list there nor elsewhere since then. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.8.1-rc1v1.8.1-rc1Junio C Hamano2012-12-071-22/+4
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation/diff-config: work around AsciiDoc misfortuneJunio C Hamano2012-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The line that happens to begin with indent followed by "3. " was interpreted as if it was an enumerated list; just wrap the lines differently to work it around for now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'maint'Junio C Hamano2012-12-071-0/+19
|\ \ \ | |/ / | | | | | | | | | * maint: Update draft release notes to 1.8.0.2
| * | Update draft release notes to 1.8.0.2Junio C Hamano2012-12-071-0/+19
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'jc/doc-push-satellite' into maintJunio C Hamano2012-12-071-2/+14
| |\ \ | | | | | | | | | | | | | | | | * jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow
* | \ \ Merge branch 'mm/status-push-pull-advise'Junio C Hamano2012-12-041-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * mm/status-push-pull-advise: document that statusHints affects git checkout
| * | | | document that statusHints affects git checkoutMatthieu Moy2012-12-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Git 1.8.1-rc0v1.8.1-rc0Junio C Hamano2012-12-031-11/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Update draft release notes to 1.8.1Junio C Hamano2012-11-291-1/+32
| | | | |
* | | | | Merge branch 'jc/doc-push-satellite'Junio C Hamano2012-11-291-2/+14
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow
| * | | | Documentation/git-push.txt: clarify the "push from satellite" workflowJunio C Hamano2012-11-271-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The context of the example to push into refs/remotes/satellite/ hierarchy of the other repository needs to be spelled out explicitly for the value of this example to be fully appreciated. Make it so. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'er/doc-add-new-commands'Junio C Hamano2012-11-291-0/+99
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * er/doc-add-new-commands: Documentation: how to add a new command
| * | | | | Documentation: how to add a new commandEric S. Raymond2012-11-261-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This document contains no new policies or proposals; it attempts to document established practices and interface requirements. Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Merge branch 'maint'Junio C Hamano2012-11-291-2/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * maint: git-fast-import.txt: improve documentation for quoted paths git-remote-mediawiki: escape ", \, and LF in file names
| * | | | | git-fast-import.txt: improve documentation for quoted pathsMatthieu Moy2012-11-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation mentioned only newlines and double quotes as characters needing escaping, but the backslash also needs it. Also, the documentation was not clearly saying that double quotes around the file name were required (double quotes in the examples could be interpreted as part of the sentence, not part of the actual string). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Merge branch 'maint'Junio C Hamano2012-11-281-0/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Start preparing for 1.8.0.2Junio C Hamano2012-11-281-0/+15
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Update draft release notes to 1.8.1Junio C Hamano2012-11-281-1/+10
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint'Junio C Hamano2012-11-271-1/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge branch 'esr/maint-doc-fast-import' into maintJunio C Hamano2012-11-271-2/+6
| |\ \ | | | | | | | | | | | | | | | | * esr/maint-doc-fast-import: doc/fast-import: clarify how content states are built
| * \ \ Merge branch 'wtk/submodule-doc-fixup' into maintJunio C Hamano2012-11-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * wtk/submodule-doc-fixup: git-submodule: wrap branch option with "<>" in usage strings.
| * | | | Documentation: improve phrasing in git-push.txtMark Szepieniec2012-11-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current version contains the sentence: Further suppose that the other person already pushed changes leading to A back to the original repository you two obtained the original commit X. which doesn't parse for me; I've changed it to Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X. Signed-off-by: Mark Szepieniec <mszepien@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Update draft release notes to 1.8.1Junio C Hamano2012-11-251-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'rr/submodule-diff-config'Junio C Hamano2012-11-253-7/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow "git diff --submodule=log" to set to be the default via configuration. * rr/submodule-diff-config: submodule: display summary header in bold diff: rename "set" variable diff: introduce diff.submodule configuration variable Documentation: move diff.wordRegex from config.txt to diff-config.txt
| * | | | | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-182-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a diff.submodule configuration variable corresponding to the '--submodule' command-line option of 'git diff'. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-11-182-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19299a8 (Documentation: Move diff.<driver>.* from config.txt to diff-config.txt, 2011-04-07) moved the diff configuration options to diff-config.txt, but forgot about diff.wordRegex, which was left behind in config.txt. Fix this. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Sync with 1.8.0.1Junio C Hamano2012-11-252-2/+15
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Git 1.8.0.1v1.8.0.1Junio C Hamano2012-11-252-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Update draft release notes for 1.8.1Junio C Hamano2012-11-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Merge branch 'esr/maint-doc-fast-import'Junio C Hamano2012-11-211-2/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * esr/maint-doc-fast-import: doc/fast-import: clarify how content states are built
| * | | | | doc/fast-import: clarify how content states are builtEric S. Raymond2012-11-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Jeff King <peff@peff.net>
* | | | | | Merge branch 'wtk/submodule-doc-fixup'Junio C Hamano2012-11-211-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * wtk/submodule-doc-fixup: git-submodule: wrap branch option with "<>" in usage strings.
| * | | | | git-submodule: wrap branch option with "<>" in usage strings.W. Trevor King2012-10-251-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "-b <branch>" instead of "-b branch". This brings the usage strings in line with other options, e.g. "--reference <repository>". Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Jeff King <peff@peff.net>
* | | | | Sixth batch for 1.8.1Junio C Hamano2012-11-201-3/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'jl/submodule-rm'Junio C Hamano2012-11-201-15/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jl/submodule-rm: docs: move submodule section
| * | | | | docs: move submodule sectionMatt Kraai2012-11-141-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 293ab15e ("submodule: teach rm to remove submodules unless they contain a git directory", 2012-09-26) inserted the "Submodules" section between a sentence describing a command and the command. Move the "Submodules" section further down. Noticed-by: Horst H. von Brand Signed-off-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>