Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rh/mergetool-regression-fix' | Junio C Hamano | 2017-01-18 |
|\ | |||
| * | rev-parse doc: pass "--" to rev-parse in the --prefix example | Richard Hansen | 2017-01-10 |
* | | Merge branch 'bw/pathspec-cleanup' | Junio C Hamano | 2017-01-18 |
|\ \ | |||
| * | | pathspec: remove the deprecated get_pathspec function | Brandon Williams | 2017-01-08 |
* | | | Merge branch 'ls/p4-retry-thrice' | Junio C Hamano | 2017-01-18 |
|\ \ \ | |||
| * | | | git-p4: do not pass '-r 0' to p4 commands | Igor Kushnir | 2016-12-29 |
* | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-01-18 |
|\ \ \ \ | |||
| * | | | | grep: enable recurse-submodules to work on <tree> objects | Brandon Williams | 2016-12-22 |
| * | | | | grep: optionally recurse into submodules | Brandon Williams | 2016-12-22 |
* | | | | | RelNotes: drop merge-later comments for maint | Junio C Hamano | 2017-01-17 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ | |||
| * | | | | | Almost ready for 2.11.1 | Junio C Hamano | 2017-01-17 |
| * | | | | | Merge branch 'mm/gc-safety-doc' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'mm/push-social-engineering-attack-doc' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'ls/filter-process' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'kh/tutorial-grammofix' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'lr/doc-fix-cet' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dt/smart-http-detect-server-going-away' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/quote-env-path-list-component' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/commit-only-allow-empty' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-walker-limit-redirect' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | | | Fifth batch 2.12 | Junio C Hamano | 2017-01-10 |
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | submodule: add absorb-git-dir function | Stefan Beller | 2016-12-12 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | diff: retire "compaction" heuristics | Junio C Hamano | 2016-12-23 |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/abbrev-autoscale-config' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | config.abbrev: document the new default that auto-scales | Junio C Hamano | 2016-12-22 |
| |/ / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | upload-pack: optionally allow fetching any sha1 | David Turner | 2016-11-18 |
* | | | | | | | | | | | | | | | | | Merge branch 'mm/gc-safety-doc' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | git-gc.txt: expand discussion of races with other processes | Matt McCutchen | 2016-11-16 |
* | | | | | | | | | | | | | | | | | Merge branch 'mm/push-social-engineering-attack-doc' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | doc: mention transfer data leaks in more places | Matt McCutchen | 2016-11-14 |
| |/ / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | Fourth batch for 2.12 | Junio C Hamano | 2016-12-27 |
* | | | | | | | | | | | | | | | Merge branch 'lt/shortlog-by-committer' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | shortlog: test and document --committer option | Jeff King | 2016-12-16 |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process values | Lars Schneider | 2016-12-06 |
* | | | | | | | | | | | | | | | Merge branch 'bw/transport-protocol-policy' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | transport: add protocol policy config option | Brandon Williams | 2016-12-15 |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'cp/merge-continue' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | merge: add '--continue' option as a synonym for 'git commit' | Chris Packham | 2016-12-14 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-config-cleanup' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | submodule-config: clarify parsing of null_sha1 element | Stefan Beller | 2016-11-22 |
| * | | | | | | | | | | | | | | | submodule-config: rename commit_sha1 to treeish_name | Stefan Beller | 2016-11-22 |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Third batch for 2.12 | Junio C Hamano | 2016-12-21 |
* | | | | | | | | | | | | | | | Merge branch 'jk/quote-env-path-list-component' | Junio C Hamano | 2016-12-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | alternates: accept double-quoted paths | Jeff King | 2016-12-12 |
* | | | | | | | | | | | | | | | Second batch for 2.12 | Junio C Hamano | 2016-12-19 |