summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
| * 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>
* | 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>
* | Start preparing for 1.8.0.2Junio C Hamano2012-11-281-0/+15
|/ | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* 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
| * 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' into maintJunio C Hamano2012-11-271-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>
* | | 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>
* | | Git 1.8.0.1v1.8.0.1Junio C Hamano2012-11-252-2/+15
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Further preparation for 1.8.0.1Junio C Hamano2012-11-201-1/+7
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'mm/maint-doc-commit-edit' into maintJunio C Hamano2012-11-201-0/+5
|\ \ \ | | | | | | | | | | | | | | | | * mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly
| * | | Document 'git commit --no-edit' explicitlyMatthieu Moy2012-11-021-0/+5
| | |/ | |/| | | | | | | | | | Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Jeff King <peff@peff.net>
* | | Merge branch 'as/maint-doc-fix-no-post-rewrite' into maintJunio C Hamano2012-11-201-4/+3
|\ \ \ | | | | | | | | | | | | | | | | * as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description
| * | | commit: fixup misplacement of --no-post-rewrite descriptionAndreas Schwab2012-11-021-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Start preparing for 1.8.0.1Junio C Hamano2012-11-181-0/+46
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'po/maint-refs-replace-docs' into maintJunio C Hamano2012-11-181-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refs/replace hierarchy was not mentioned in the repository-layout docs. * po/maint-refs-replace-docs: Doc repository-layout: Show refs/replace
| * | | | Doc repository-layout: Show refs/replacePhilip Oakley2012-10-251-0/+6
| | |/ / | |/| | | | | | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Jeff King <peff@peff.net>
* | | | Merge branch 'mm/maint-doc-remote-tracking' into maintJunio C Hamano2012-11-184-6/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Update "remote tracking branch" in the documentation to "remote-tracking branch". * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch
| * | | Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy2012-10-254-6/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Git 1.8.0v1.8.0Junio C Hamano2012-10-212-9/+18
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.8.0-rc3v1.8.0-rc3Junio C Hamano2012-10-171-4/+3
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.7.12.4Junio C Hamano2012-10-172-1/+25
|\ \ \ | |/ /
| * | Git 1.7.12.4v1.7.12.4maint-1.7.12Junio C Hamano2012-10-172-1/+25
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'rr/git-uri-doc' into maintJunio C Hamano2012-10-171-2/+6
| |\ \ | | | | | | | | | | | | | | | | * rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
| * \ \ Merge branch 'nd/doc-ignore' into maintJunio C Hamano2012-10-171-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
| * \ \ \ Merge branch 'jc/doc-long-options' into maintJunio C Hamano2012-10-171-1/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jc/doc-long-options: gitcli: parse-options lets you omit tail of long options
| * \ \ \ \ Merge branch 'po/maint-docs' into maintJunio C Hamano2012-10-175-15/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * \ \ \ \ \ Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano2012-10-172-2/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * \ \ \ \ \ \ Merge branch 'db/doc-custom-xmlto' into maintJunio C Hamano2012-10-171-2/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * db/doc-custom-xmlto: Documentation/Makefile: Allow custom XMLTO binary
* | | | | | | | | Documentation/RelNotes: remove "updated up to this revision" markersThomas Ackermann2012-10-165-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Update draft release notes to 1.8.0Junio C Hamano2012-10-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are almost there... Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | Merge branch 'rr/git-uri-doc'Junio C Hamano2012-10-101-2/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them
| * | | | | | | | Git url doc: mark ftp/ftps as read-only and deprecate themRamkumar Ramachandra2012-10-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Merge branch 'nd/doc-ignore'Junio C Hamano2012-10-101-1/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning
| * | | | | | | | gitignore.txt: suggestions how to get literal # or ! at the beginningNguyễn Thái Ngọc Duy2012-10-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Merge branch 'jc/doc-long-options'Junio C Hamano2012-10-101-1/+11
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * jc/doc-long-options: gitcli: parse-options lets you omit tail of long options
| * | | | | | | | gitcli: parse-options lets you omit tail of long optionsJunio C Hamano2012-10-041-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Sync with maintJunio C Hamano2012-10-101-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * maint: attr: a note about the order of .gitattributes lookup
| * | | | | | | | attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy2012-10-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Git 1.8.0-rc1v1.8.0-rc1Junio C Hamano2012-10-081-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | Sync with 1.7.12.3Junio C Hamano2012-10-082-1/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Git 1.7.12.3v1.7.12.3Junio C Hamano2012-10-082-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | Merge branch 'rt/maint-clone-single' into maintJunio C Hamano2012-10-081-4/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ Merge branch 'jc/blame-follows-renames' into maintJunio C Hamano2012-10-081-0/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Update draft release notes to 1.8.0Junio C Hamano2012-10-021-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>