summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Sixth batch for 2.12Junio C Hamano2017-01-181-0/+64
* Merge branch 'sb/remove-gitview'Junio C Hamano2017-01-182-7/+9
|\
| * doc: git-gui browser does not default to HEADsb/remove-gitviewPhilip Oakley2017-01-131-1/+1
| * doc: gitk: add the upstream repo locationPhilip Oakley2017-01-131-2/+8
| * doc: gitk: remove gitview referencePhilip Oakley2017-01-131-4/+0
* | Merge branch 'js/asciidoctor-tweaks'Junio C Hamano2017-01-183-9/+18
|\ \
| * | asciidoctor: fix user-manual to be built by `asciidoctor`js/asciidoctor-tweaks마누엘2017-01-132-1/+9
| * | giteveryday: unbreak rendering with AsciiDoctorJohannes Schindelin2017-01-071-8/+9
* | | Merge branch 'rh/mergetool-regression-fix'Junio C Hamano2017-01-181-1/+2
|\ \ \
| * | | rev-parse doc: pass "--" to rev-parse in the --prefix exampleRichard Hansen2017-01-101-1/+2
| |/ /
* | | Merge branch 'bw/pathspec-cleanup'Junio C Hamano2017-01-181-2/+0
|\ \ \
| * | | pathspec: remove the deprecated get_pathspec functionBrandon Williams2017-01-081-2/+0
* | | | Merge branch 'ls/p4-retry-thrice'Junio C Hamano2017-01-181-0/+2
|\ \ \ \
| * | | | git-p4: do not pass '-r 0' to p4 commandsls/p4-retry-thriceIgor Kushnir2016-12-291-0/+2
* | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-181-0/+14
|\ \ \ \ \
| * | | | | grep: enable recurse-submodules to work on <tree> objectsBrandon Williams2016-12-221-2/+11
| * | | | | grep: optionally recurse into submodulesBrandon Williams2016-12-221-0/+5
* | | | | | RelNotes: drop merge-later comments for maintJunio C Hamano2017-01-171-44/+0
* | | | | | Merge branch 'maint'Junio C Hamano2017-01-172-1/+122
|\ \ \ \ \ \
| * | | | | | Almost ready for 2.11.1Junio C Hamano2017-01-172-1/+122
| * | | | | | Merge branch 'mm/gc-safety-doc' into maintJunio C Hamano2017-01-172-9/+29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mm/push-social-engineering-attack-doc' into maintJunio C Hamano2017-01-176-22/+51
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-171-1/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'kh/tutorial-grammofix' into maintJunio C Hamano2017-01-171-6/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'lr/doc-fix-cet' into maintJunio C Hamano2017-01-171-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-172-3/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-01-171-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-walker-limit-redirect' into maintJunio C Hamano2017-01-171-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | Fifth batch 2.12Junio C Hamano2017-01-101-0/+45
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-101-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | submodule: add absorb-git-dir functionStefan Beller2016-12-121-0/+15
* | | | | | | | | | | | | | | | | Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano2017-01-102-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-232-6/+2
* | | | | | | | | | | | | | | | | | Merge branch 'jc/abbrev-autoscale-config'Junio C Hamano2017-01-101-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | config.abbrev: document the new default that auto-scalesjc/abbrev-autoscale-configJunio C Hamano2016-12-221-4/+5
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away'Junio C Hamano2017-01-102-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-awayDavid Turner2016-11-182-3/+8
* | | | | | | | | | | | | | | | | | Merge branch 'mm/gc-safety-doc'Junio C Hamano2017-01-102-9/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | git-gc.txt: expand discussion of races with other processesmm/gc-safety-docMatt McCutchen2016-11-162-9/+29
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mm/push-social-engineering-attack-doc'Junio C Hamano2017-01-106-22/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | doc: mention transfer data leaks in more placesmm/push-social-engineering-attack-docMatt McCutchen2016-11-146-22/+51
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Fourth batch for 2.12Junio C Hamano2016-12-271-0/+42
* | | | | | | | | | | | | | | Merge branch 'lt/shortlog-by-committer'Junio C Hamano2016-12-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | shortlog: test and document --committer optionJeff King2016-12-161-0/+4
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-12-271-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-061-1/+3
* | | | | | | | | | | | | | | Merge branch 'bw/transport-protocol-policy'Junio C Hamano2016-12-272-24/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | transport: add protocol policy config optionBrandon Williams2016-12-152-24/+60
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-271-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \