summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2012-12-15Git 1.8.1-rc2Libravatar Junio C Hamano1-0/+6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-15Renumber list in api-command.txtLibravatar Thomas Ackermann1-7/+7
Start list with 1 instead of 0; ASCIIDOC will renumber it anyway. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-13Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2012-12-13Merge branch 'mh/doc-remote-helpers'Libravatar Junio C Hamano1-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
2012-12-13git.txt: add missing info about --git-dir command-line optionLibravatar Manlio Perillo1-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>
2012-12-12git(1): show link to contributor summary pageLibravatar Junio C Hamano1-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>
2012-12-10Sync with 1.8.0.2Libravatar Junio C Hamano2-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>
2012-12-10Git 1.8.0.2Libravatar Junio C Hamano1-1/+2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-10Documentation/git-stash.txt: add a missing verbLibravatar Sébastien Loriot1-1/+1
Signed-off-by: Sébastien Loriot <sloriot.ml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-09git(1): remove a defunct link to "list of authors"Libravatar Junio C Hamano1-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>
2012-12-07Git 1.8.1-rc1Libravatar Junio C Hamano1-22/+4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-07Documentation/diff-config: work around AsciiDoc misfortuneLibravatar Junio C Hamano1-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>
2012-12-07Merge branch 'maint'Libravatar Junio C Hamano1-0/+19
* maint: Update draft release notes to 1.8.0.2
2012-12-07Update draft release notes to 1.8.0.2Libravatar Junio C Hamano1-0/+19
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-07Merge branch 'jc/doc-push-satellite' into maintLibravatar Junio C Hamano1-2/+14
* jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow
2012-12-07git-remote-helpers.txt: clarify options & ref list attributesLibravatar Max Horn1-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>
2012-12-07git-remote-helpers.txt: clarify command <-> capability correspondencesLibravatar Max Horn1-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>
2012-12-07git-remote-helpers.txt: rearrange description of capabilitiesLibravatar Max Horn1-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>
2012-12-07git-remote-helpers.txt: minor grammar fixLibravatar Max Horn1-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>
2012-12-07git-remote-helpers.txt: document missing capabilitiesLibravatar Max Horn1-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>
2012-12-07git-remote-helpers.txt: document invocation before input formatLibravatar Max Horn1-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>
2012-12-04Merge branch 'mm/status-push-pull-advise'Libravatar Junio C Hamano1-2/+3
* mm/status-push-pull-advise: document that statusHints affects git checkout
2012-12-04document that statusHints affects git checkoutLibravatar Matthieu Moy1-2/+3
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-03Git 1.8.1-rc0Libravatar Junio C Hamano1-11/+13
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-29Update draft release notes to 1.8.1Libravatar Junio C Hamano1-1/+32
2012-11-29Merge branch 'jc/doc-push-satellite'Libravatar Junio C Hamano1-2/+14
* jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow
2012-11-29Merge branch 'er/doc-add-new-commands'Libravatar Junio C Hamano1-0/+99
* er/doc-add-new-commands: Documentation: how to add a new command
2012-11-29Merge branch 'maint'Libravatar Junio C Hamano1-2/+6
* maint: git-fast-import.txt: improve documentation for quoted paths git-remote-mediawiki: escape ", \, and LF in file names
2012-11-29git-fast-import.txt: improve documentation for quoted pathsLibravatar Matthieu Moy1-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>
2012-11-28Merge branch 'maint'Libravatar Junio C Hamano1-0/+15
2012-11-28Update draft release notes to 1.8.1Libravatar Junio C Hamano1-1/+10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-28Start preparing for 1.8.0.2Libravatar Junio C Hamano1-0/+15
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-27Documentation/git-push.txt: clarify the "push from satellite" workflowLibravatar Junio C Hamano1-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>
2012-11-27Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2012-11-27Merge branch 'esr/maint-doc-fast-import' into maintLibravatar Junio C Hamano1-2/+6
* esr/maint-doc-fast-import: doc/fast-import: clarify how content states are built
2012-11-27Merge branch 'wtk/submodule-doc-fixup' into maintLibravatar Junio C Hamano1-1/+1
* wtk/submodule-doc-fixup: git-submodule: wrap branch option with "<>" in usage strings.
2012-11-27Documentation: improve phrasing in git-push.txtLibravatar Mark Szepieniec1-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>
2012-11-26Documentation: how to add a new commandLibravatar Eric S. Raymond1-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>
2012-11-25Update draft release notes to 1.8.1Libravatar Junio C Hamano1-0/+14
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-25Merge branch 'rr/submodule-diff-config'Libravatar Junio C Hamano3-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
2012-11-25Sync with 1.8.0.1Libravatar Junio C Hamano2-2/+15
2012-11-25Git 1.8.0.1Libravatar Junio C Hamano2-2/+15
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-21Update draft release notes for 1.8.1Libravatar Junio C Hamano1-0/+10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-21Merge branch 'esr/maint-doc-fast-import'Libravatar Junio C Hamano1-2/+6
* esr/maint-doc-fast-import: doc/fast-import: clarify how content states are built
2012-11-21Merge branch 'wtk/submodule-doc-fixup'Libravatar Junio C Hamano1-1/+1
* wtk/submodule-doc-fixup: git-submodule: wrap branch option with "<>" in usage strings.
2012-11-20Sixth batch for 1.8.1Libravatar Junio C Hamano1-3/+39
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-20Merge branch 'jl/submodule-rm'Libravatar Junio C Hamano1-15/+15
* jl/submodule-rm: docs: move submodule section
2012-11-20Merge branch 'ta/doc-cleanup'Libravatar Junio C Hamano20-68/+134
* ta/doc-cleanup: Documentation: build html for all files in technical and howto Documentation/howto: convert plain text files to asciidoc Documentation/technical: convert plain text files to asciidoc Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1 Split over-long synopsis in git-fetch-pack.txt into several lines
2012-11-20Sync with maintLibravatar Junio C Hamano1-1/+7
* maint: Further preparation for 1.8.0.1
2012-11-20Further preparation for 1.8.0.1Libravatar Junio C Hamano1-1/+7
Signed-off-by: Junio C Hamano <gitster@pobox.com>