summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)Author
2012-12-10Git 1.8.0.2v1.8.0.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-10Documentation/git-stash.txt: add a missing verbSébastien Loriot
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"Junio C Hamano
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-07Update draft release notes to 1.8.0.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-07Merge branch 'jc/doc-push-satellite' into maintJunio C Hamano
* jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow
2012-11-29git-fast-import.txt: improve documentation for quoted pathsMatthieu Moy
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-28Start preparing for 1.8.0.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-28Documentation/git-push.txt: clarify the "push from satellite" workflowJunio C Hamano
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 'esr/maint-doc-fast-import' into maintJunio C Hamano
* esr/maint-doc-fast-import: doc/fast-import: clarify how content states are built
2012-11-27Merge branch 'wtk/submodule-doc-fixup' into maintJunio C Hamano
* wtk/submodule-doc-fixup: git-submodule: wrap branch option with "<>" in usage strings.
2012-11-27Documentation: improve phrasing in git-push.txtMark Szepieniec
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-26Git 1.8.0.1v1.8.0.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-20Further preparation for 1.8.0.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-20Merge branch 'mm/maint-doc-commit-edit' into maintJunio C Hamano
* mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly
2012-11-20Merge branch 'as/maint-doc-fix-no-post-rewrite' into maintJunio C Hamano
* as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description
2012-11-19Start preparing for 1.8.0.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-19Merge branch 'po/maint-refs-replace-docs' into maintJunio C Hamano
The refs/replace hierarchy was not mentioned in the repository-layout docs. * po/maint-refs-replace-docs: Doc repository-layout: Show refs/replace
2012-11-19Merge branch 'mm/maint-doc-remote-tracking' into maintJunio C Hamano
Update "remote tracking branch" in the documentation to "remote-tracking branch". * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch
2012-11-08doc/fast-import: clarify how content states are builtEric S. Raymond
Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-02commit: fixup misplacement of --no-post-rewrite descriptionAndreas Schwab
In e858af6 (commit: document a couple of options) the description of the --no-post-rewrite option was put inside the paragraph for the --amend option. Move it down after the paragraph. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Jeff King <peff@peff.net>
2012-11-02Document 'git commit --no-edit' explicitlyMatthieu Moy
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Jeff King <peff@peff.net>
2012-10-25Doc repository-layout: Show refs/replacePhilip Oakley
Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Jeff King <peff@peff.net>
2012-10-25Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy
This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2 2010, Replace "remote tracking" with "remote-tracking"), but new instances of remote tracking (without dash) were introduced in the meantime. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Jeff King <peff@peff.net>
2012-10-25git-submodule: wrap branch option with "<>" in usage strings.W. Trevor King
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>
2012-10-21Git 1.8.0v1.8.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-17Git 1.8.0-rc3v1.8.0-rc3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-17Sync with 1.7.12.4Junio C Hamano
2012-10-17Git 1.7.12.4v1.7.12.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-17Merge branch 'rr/git-uri-doc' into maintJunio C Hamano
* rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
2012-10-17Merge branch 'nd/doc-ignore' into maintJunio C Hamano
* nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
2012-10-17Merge branch 'jc/doc-long-options' into maintJunio C Hamano
* jc/doc-long-options: gitcli: parse-options lets you omit tail of long options
2012-10-17Merge branch 'po/maint-docs' into maintJunio C Hamano
* po/maint-docs: Doc branch: show -vv option and alternative Doc clean: add See Also link Doc add: link gitignore Doc: separate gitignore pattern sources Doc: shallow clone deepens _to_ new depth
2012-10-17Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano
* jc/ll-merge-binary-ours: ll-merge: warn about inability to merge binary files only when we can't attr: "binary" attribute should choose built-in "binary" merge driver merge: teach -Xours/-Xtheirs to binary ll-merge driver
2012-10-17Merge branch 'db/doc-custom-xmlto' into maintJunio C Hamano
* db/doc-custom-xmlto: Documentation/Makefile: Allow custom XMLTO binary
2012-10-16Documentation/RelNotes: remove "updated up to this revision" markersThomas Ackermann
These were used to keep track of the last commit a release notes entry was written for, and should have been removed when cutting the final release. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-16Update draft release notes to 1.8.0Junio C Hamano
We are almost there... Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-10Merge branch 'rr/git-uri-doc'Junio C Hamano
* rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
2012-10-10Merge branch 'nd/doc-ignore'Junio C Hamano
* nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
2012-10-10Merge branch 'jc/doc-long-options'Junio C Hamano
* jc/doc-long-options: gitcli: parse-options lets you omit tail of long options
2012-10-10Sync with maintJunio C Hamano
* maint: attr: a note about the order of .gitattributes lookup
2012-10-10attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy
This is the documentation part of 1a9d7e9 (attr.c: read .gitattributes from index as well. - 2007-08-14) 06f33c1 (Read attributes from the index that is being checked out - 2009-03-13) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-08Git url doc: mark ftp/ftps as read-only and deprecate themRamkumar Ramachandra
It is not even worth mentioning their removal; just discourage people from using them. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-08Git 1.8.0-rc1v1.8.0-rc1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-08Sync with 1.7.12.3Junio C Hamano
2012-10-08Git 1.7.12.3v1.7.12.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-08Merge branch 'rt/maint-clone-single' into maintJunio C Hamano
A repository created with "git clone --single" had its fetch refspecs set up just like a clone without "--single", leading the subsequent "git fetch" to slurp all the other branches, defeating the whole point of specifying "only this branch". * rt/maint-clone-single: clone --single: limit the fetch refspec to fetched branch
2012-10-08Merge branch 'jc/blame-follows-renames' into maintJunio C Hamano
It was unclear in the documentation for "git blame" that it is unnecessary for users to use the "--follow" option. * jc/blame-follows-renames: git blame: document that it always follows origin across whole-file renames
2012-10-07gitignore.txt: suggestions how to get literal # or ! at the beginningNguyễn Thái Ngọc Duy
We support backslash escape, but we hide the details behind the phrase "a shell glob suitable for consumption by fnmatch(3)". So it may not be obvious how one can get literal # or ! at the beginning of pattern. Add a few lines on how to work around the magic characters. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-05gitcli: parse-options lets you omit tail of long optionsJunio C Hamano
Describe the behaviour, but do warn people against taking it too literally and expect an abbreviation valid today will stay valid forever. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-10-03Update draft release notes to 1.8.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>