summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* http: control GSSAPI credential delegationps/http-gssapi-cred-delegationPetr Stodulka2016-09-291-0/+14
| | | | | | | | | | | | | | | | | | | | | Delegation of credentials is disabled by default in libcurl since version 7.21.7 due to security vulnerability CVE-2011-2192. Which makes troubles with GSS/kerberos authentication when delegation of credentials is required. This can be changed with option CURLOPT_GSSAPI_DELEGATION in libcurl with set expected parameter since libcurl version 7.22.0. This patch provides new configuration variable http.delegation which corresponds to curl parameter "--delegation" (see man 1 curl). The following values are supported: * none (default). * policy * always Signed-off-by: Petr Stodulka <pstodulk@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Start preparing for 2.10.1Junio C Hamano2016-09-191-0/+33
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'po/range-doc' into maintJunio C Hamano2016-09-195-51/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify various ways to specify the "revision ranges" in the documentation. * po/range-doc: doc: revisions: sort examples and fix alignment of the unchanged doc: revisions: show revision expansion in examples doc: revisions - clarify reachability examples doc: revisions - define `reachable` doc: gitrevisions - clarify 'latter case' is revision walk doc: gitrevisions - use 'reachable' in page description doc: revisions: single vs multi-parent notation comparison doc: revisions: extra clarification of <rev>^! notation effects doc: revisions: give headings for the two and three dot notations doc: show the actual left, right, and boundary marks doc: revisions - name the left and right sides doc: use 'symmetric difference' consistently
| * doc: revisions: sort examples and fix alignment of the unchangedpo/range-docPhilip Oakley2016-08-131-6/+6
| | | | | | | | | | | | | | | | | | The previous commit adjusted the column alignment for revision examples which show expansion. Fix the unchanged examples and sort those that show expansions to the end of the list. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: revisions: show revision expansion in examplesPhilip Oakley2016-08-131-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | The revisions examples show the revison arguments and the selected commits, but do not show the intermediate step of the expansion of the special 'range' notations. Extend the examples, including an all-parents multi-parent merge commit example. Sort the examples and fix the alignment for those unaffected in the next commit. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: revisions - clarify reachability examplesPhilip Oakley2016-08-131-5/+6
| | | | | | | | | | | | | | | | | | For the r1..r2 case, the exclusion of r1, rather than inclusion of r2, would be the unexpected case in natural language for a simple linear development, i.e. start..end excludes start. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: revisions - define `reachable`Philip Oakley2016-08-131-4/+10
| | | | | | | | | | | | | | | | Do not self-define `reachable`, which can lead to misunderstanding. Instead define `reachability` explictly. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: gitrevisions - clarify 'latter case' is revision walkPhilip Oakley2016-08-131-2/+2
| | | | | | | | | | | | | | | | The prior sentence has too many clauses for easy parsing. Replace 'the latter case' with a direct quote. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: gitrevisions - use 'reachable' in page descriptionPhilip Oakley2016-08-131-2/+2
| | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: revisions: single vs multi-parent notation comparisonPhilip Oakley2016-08-131-0/+4
| | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: revisions: extra clarification of <rev>^! notation effectsPhilip Oakley2016-08-131-1/+2
| | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: revisions: give headings for the two and three dot notationsPhilip Oakley2016-08-121-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While there, also break out the other shorthand notations and add a title for the revision range summary (which also appears in git-rev-parse, so keep it mixed case). We do not quote the notation within the headings as the asciidoc -> docbook -> groff man viewer toolchain, particularly the docbook-groff step, does not cope with two font changes, failing to return the heading font to bold after the quotation of the notation. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: show the actual left, right, and boundary marksPhilip Oakley2016-07-201-1/+1
| | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: revisions - name the left and right sidesPhilip Oakley2016-07-201-1/+1
| | | | | | | | | | | | | | | | The terms left and right side originate from the symmetric difference. Name them there. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * doc: use 'symmetric difference' consistentlyPhilip Oakley2016-07-202-3/+3
| | | | | | | | | | Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Start maintenance track for 2.10.x seriesJunio C Hamano2016-09-0827-90/+1008
|\ \
| * | Git 2.10v2.10.0Junio C Hamano2016-09-021-0/+5
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | A few more fixes before the final 2.10Junio C Hamano2016-08-311-3/+8
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'ls/packet-line-protocol-doc-fix'Junio C Hamano2016-08-311-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct an age-old calco (is that a typo-like word for calc) in the documentation. * ls/packet-line-protocol-doc-fix: pack-protocol: fix maximum pkt-line size
| * | | Git 2.10-rc2v2.10.0-rc2Junio C Hamano2016-08-261-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | gitattributes: Document the unified "auto" handlingTorsten Bögershausen2016-08-261-34/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the documentation about text=auto: text=auto now follows the core.autocrlf handling when files are not normalized in the repository. For a cross platform project recommend the usage of attributes for line-ending conversions. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Prepare for 2.10.0-rc2Junio C Hamano2016-08-251-2/+29
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Merge branch 'dg/document-git-c-in-git-config-doc'Junio C Hamano2016-08-251-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "git -c var[=val] cmd" facility to append a configuration variable definition at the end of the search order was described in git(1) manual page, but not in git-config(1), which was more likely place for people to look for when they ask "can I make a one-shot override, and if so how?" * dg/document-git-c-in-git-config-doc: doc: mention `git -c` in git-config(1)
| * \ \ \ Merge branch 'hv/doc-commit-reference-style'Junio C Hamano2016-08-251-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A small doc update. * hv/doc-commit-reference-style: SubmittingPatches: document how to reference previous commits
| * | | | | git ls-files: text=auto eol=lf is supported in Git 2.10Torsten Bögershausen2016-08-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The man page for `git ls-files --eol` mentions the combination of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not supported yet, but may be in the future. Now they are supported. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Git 2.10-rc1v2.10.0-rc1Junio C Hamano2016-08-191-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | RelNotes: final batch of topics before -rc1Junio C Hamano2016-08-171-0/+13
| | | | | |
| * | | | | relnotes: redo the description of text=auto fixJunio C Hamano2016-08-171-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Relnotes: decribe the updates to the "text=auto" attributeJunio C Hamano2016-08-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helped-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Git 2.10-rc0v2.10.0-rc0Junio C Hamano2016-08-141-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Sync with 2.9.3Junio C Hamano2016-08-122-1/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tag 'v2.9.3': Git 2.9.3
| * | | | | | Final batch before 2.10-rc0Junio C Hamano2016-08-121-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | Merge branch 'vs/typofix'Junio C Hamano2016-08-127-7/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vs/typofix: Spelling fixes
| | * | | | | | Spelling fixesvs/typofixVille Skyttä2016-08-117-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <BAD> <CORRECTED> accidently accidentally commited committed dependancy dependency emtpy empty existance existence explicitely explicitly git-upload-achive git-upload-archive hierachy hierarchy indegee indegree intial initial mulitple multiple non-existant non-existent precendence. precedence. priviledged privileged programatically programmatically psuedo-binary pseudo-binary soemwhere somewhere successfull successful transfering transferring uncommited uncommitted unkown unknown usefull useful writting writing Signed-off-by: Ville Skyttä <ville.skytta@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | Merge branch 'ms/document-pack-window-memory-is-per-thread'Junio C Hamano2016-08-122-4/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ms/document-pack-window-memory-is-per-thread: document git-repack interaction of pack.threads and pack.windowMemory
| * \ \ \ \ \ \ \ Sync with maintJunio C Hamano2016-08-101-0/+68
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Yet another batch for 2.9.3
| * | | | | | | | | Twelfth batch for 2.10Junio C Hamano2016-08-101-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | | Merge branch 'jt/format-patch-from-config'Junio C Hamano2016-08-101-0/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git format-patch" learned format.from configuration variable to specify the default settings for its "--from" option. * jt/format-patch-from-config: format-patch: format.from gives the default for --from
| | * | | | | | | | | format-patch: format.from gives the default for --fromjt/format-patch-from-configJosh Triplett2016-08-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps users who would prefer format-patch to default to --from, and makes it easier to change the default in the future. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | | | Merge branch 'jk/push-force-with-lease-creation'Junio C Hamano2016-08-101-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git push --force-with-lease" already had enough logic to allow ensuring that such a push results in creation of a ref (i.e. the receiving end did not have another push from sideways that would be discarded by our force-pushing), but didn't expose this possibility to the users. It does so now. * jk/push-force-with-lease-creation: t5533: make it pass on case-sensitive filesystems push: allow pushing new branches with --force-with-lease push: add shorthand for --force-with-lease branch creation Documentation/git-push: fix placeholder formatting
| * | | | | | | | | | Sync with maintJunio C Hamano2016-08-081-0/+34
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Hopefully final batch for 2.9.3
| * | | | | | | | | | | Eleventh batch for 2.10Junio C Hamano2016-08-081-20/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | | | | Merge branch 'jc/hashmap-doc-init'Junio C Hamano2016-08-081-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API documentation for hashmap was unclear if hashmap_entry can be safely discarded without any other consideration. State that it is safe to do so. * jc/hashmap-doc-init: hashmap: clarify that hashmap_entry can safely be discarded
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-recommend-shallowness'Junio C Hamano2016-08-081-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc update. * sb/submodule-recommend-shallowness: gitmodules: document shallow recommendation
| | * | | | | | | | | | | | gitmodules: document shallow recommendationsb/submodule-recommend-shallownessStefan Beller2016-08-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | | | | | | Merge branch 'jh/clean-smudge-f-doc'Junio C Hamano2016-08-081-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A minor documentation update. * jh/clean-smudge-f-doc: clarify %f documentation
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-date'Junio C Hamano2016-08-082-9/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reflog output format is documented better, and a new format --date=unix to report the seconds-since-epoch (without timezone) has been added. * jk/reflog-date: date: clarify --date=raw description date: add "unix" format date: document and test "raw-local" mode doc/pretty-formats: explain shortening of %gd doc/pretty-formats: describe index/time formats for %gd doc/rev-list-options: explain "-g" output formats doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
| * | | | | | | | | | | | | | | Tenth batch for 2.10Junio C Hamano2016-08-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | | | | | | | | | | | Merge branch 'sb/pack-protocol-doc-nak'Junio C Hamano2016-08-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A doc update. * sb/pack-protocol-doc-nak: Documentation: pack-protocol correct NAK response
| * | | | | | | | | | | | | | | | Ninth batch of topics for 2.10Junio C Hamano2016-08-031-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status