Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sixth batch for 2.12 | Junio C Hamano | 2017-01-18 | 1 | -0/+64 |
* | Merge branch 'sb/remove-gitview' | Junio C Hamano | 2017-01-18 | 2 | -7/+9 |
|\ | |||||
| * | doc: git-gui browser does not default to HEADsb/remove-gitview | Philip Oakley | 2017-01-13 | 1 | -1/+1 |
| * | doc: gitk: add the upstream repo location | Philip Oakley | 2017-01-13 | 1 | -2/+8 |
| * | doc: gitk: remove gitview reference | Philip Oakley | 2017-01-13 | 1 | -4/+0 |
* | | Merge branch 'js/asciidoctor-tweaks' | Junio C Hamano | 2017-01-18 | 3 | -9/+18 |
|\ \ | |||||
| * | | asciidoctor: fix user-manual to be built by `asciidoctor`js/asciidoctor-tweaks | 마누엘 | 2017-01-13 | 2 | -1/+9 |
| * | | giteveryday: unbreak rendering with AsciiDoctor | Johannes Schindelin | 2017-01-07 | 1 | -8/+9 |
* | | | Merge branch 'rh/mergetool-regression-fix' | Junio C Hamano | 2017-01-18 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | rev-parse doc: pass "--" to rev-parse in the --prefix example | Richard Hansen | 2017-01-10 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge branch 'bw/pathspec-cleanup' | Junio C Hamano | 2017-01-18 | 1 | -2/+0 |
|\ \ \ | |||||
| * | | | pathspec: remove the deprecated get_pathspec function | Brandon Williams | 2017-01-08 | 1 | -2/+0 |
* | | | | Merge branch 'ls/p4-retry-thrice' | Junio C Hamano | 2017-01-18 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | git-p4: do not pass '-r 0' to p4 commandsls/p4-retry-thrice | Igor Kushnir | 2016-12-29 | 1 | -0/+2 |
* | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-01-18 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | grep: enable recurse-submodules to work on <tree> objects | Brandon Williams | 2016-12-22 | 1 | -2/+11 |
| * | | | | | grep: optionally recurse into submodules | Brandon Williams | 2016-12-22 | 1 | -0/+5 |
* | | | | | | RelNotes: drop merge-later comments for maint | Junio C Hamano | 2017-01-17 | 1 | -44/+0 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2017-01-17 | 2 | -1/+122 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Almost ready for 2.11.1 | Junio C Hamano | 2017-01-17 | 2 | -1/+122 |
| * | | | | | | Merge branch 'mm/gc-safety-doc' into maint | Junio C Hamano | 2017-01-17 | 2 | -9/+29 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'mm/push-social-engineering-attack-doc' into maint | Junio C Hamano | 2017-01-17 | 6 | -22/+51 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ls/filter-process' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'kh/tutorial-grammofix' into maint | Junio C Hamano | 2017-01-17 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'lr/doc-fix-cet' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/smart-http-detect-server-going-away' into maint | Junio C Hamano | 2017-01-17 | 2 | -3/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/quote-env-path-list-component' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/commit-only-allow-empty' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-walker-limit-redirect' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | Fifth batch 2.12 | Junio C Hamano | 2017-01-10 | 1 | -0/+45 |
* | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-10 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | submodule: add absorb-git-dir function | Stefan Beller | 2016-12-12 | 1 | -0/+15 |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2017-01-10 | 2 | -6/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristics | Junio C Hamano | 2016-12-23 | 2 | -6/+2 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/abbrev-autoscale-config' | Junio C Hamano | 2017-01-10 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | config.abbrev: document the new default that auto-scalesjc/abbrev-autoscale-config | Junio C Hamano | 2016-12-22 | 1 | -4/+5 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away' | Junio C Hamano | 2017-01-10 | 2 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-away | David Turner | 2016-11-18 | 2 | -3/+8 |
* | | | | | | | | | | | | | | | | | | Merge branch 'mm/gc-safety-doc' | Junio C Hamano | 2017-01-10 | 2 | -9/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | git-gc.txt: expand discussion of races with other processesmm/gc-safety-doc | Matt McCutchen | 2016-11-16 | 2 | -9/+29 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'mm/push-social-engineering-attack-doc' | Junio C Hamano | 2017-01-10 | 6 | -22/+51 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | doc: mention transfer data leaks in more placesmm/push-social-engineering-attack-doc | Matt McCutchen | 2016-11-14 | 6 | -22/+51 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Fourth batch for 2.12 | Junio C Hamano | 2016-12-27 | 1 | -0/+42 |
* | | | | | | | | | | | | | | | Merge branch 'lt/shortlog-by-committer' | Junio C Hamano | 2016-12-27 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | shortlog: test and document --committer option | Jeff King | 2016-12-16 | 1 | -0/+4 |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-12-27 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process values | Lars Schneider | 2016-12-06 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | Merge branch 'bw/transport-protocol-policy' | Junio C Hamano | 2016-12-27 | 2 | -24/+60 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | transport: add protocol policy config option | Brandon Williams | 2016-12-15 | 2 | -24/+60 |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'cp/merge-continue' | Junio C Hamano | 2016-12-27 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |