Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/loose-object-cache-oid' | Junio C Hamano | 2019-02-07 | 1 | -3/+3 |
|\ | |||||
| * | prefer "hash mismatch" to "sha1 mismatch" | Jeff King | 2019-01-08 | 1 | -3/+3 |
* | | Merge branch 'ds/push-sparse-tree-walk' | Junio C Hamano | 2019-02-07 | 2 | -1/+19 |
|\ \ | |||||
| * | | pack-objects: create pack.useSparse setting | Derrick Stolee | 2019-01-17 | 1 | -0/+9 |
| * | | list-objects: consume sparse tree walk | Derrick Stolee | 2019-01-17 | 1 | -1/+10 |
* | | | Merge branch 'lt/date-human' | Junio C Hamano | 2019-02-07 | 2 | -0/+11 |
|\ \ \ | |||||
| * | | | Add 'human' date format documentation | Stephen P. Smith | 2019-01-22 | 2 | -0/+11 |
* | | | | Merge branch 'jk/autocrlf-overrides-eol-doc' | Junio C Hamano | 2019-02-07 | 2 | -3/+8 |
|\ \ \ \ | |||||
| * | | | | docs/config: clarify "text property" in core.eol | Jeff King | 2019-01-29 | 1 | -2/+5 |
| * | | | | doc/gitattributes: clarify "autocrlf overrides eol" | Jeff King | 2019-01-29 | 1 | -1/+3 |
* | | | | | Merge branch 'tb/utf-16-le-with-explicit-bom' | Junio C Hamano | 2019-02-07 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Support working-tree-encoding "UTF-16LE-BOM" | Torsten Bögershausen | 2019-01-31 | 1 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'dt/cat-file-batch-ambiguous' | Junio C Hamano | 2019-02-07 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Do not print 'dangling' for cat-file in case of ambiguity | David Turner | 2019-01-19 | 1 | -0/+6 |
* | | | | | | Merge branch 'km/init-doc-typofix' | Junio C Hamano | 2019-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | init docs: correct a punctuation typo | Kyle Meyer | 2019-01-31 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'en/rebase-merge-on-sequencer' | Junio C Hamano | 2019-02-07 | 1 | -14/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase: implement --merge via the interactive machinery | Elijah Newren | 2019-01-07 | 1 | -14/+3 |
| |/ / / / / | |||||
* | | | | | | Fifth batch for 2.21 | Junio C Hamano | 2019-02-05 | 1 | -0/+90 |
* | | | | | | Merge branch 'az/instaweb-py3-http-server' | Junio C Hamano | 2019-02-05 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-instaweb: add Python builtin http.server support | Arti Zirk | 2019-01-28 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ja/doc-style-fix' | Junio C Hamano | 2019-02-05 | 14 | -94/+93 |
|\ \ \ \ \ \ | |||||
| * | | | | | | doc: tidy asciidoc style | Jean-Noël Avila | 2019-01-23 | 14 | -94/+93 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ab/commit-graph-write-progress' | Junio C Hamano | 2019-02-05 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit-graph: rename "large edges" to "extra edges" | SZEDER Gábor | 2019-01-22 | 1 | -2/+2 |
* | | | | | | | Merge branch 'jt/fetch-v2-sideband' | Junio C Hamano | 2019-02-05 | 2 | -9/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | {fetch,upload}-pack: sideband v2 fetch response | Jonathan Tan | 2019-01-17 | 1 | -0/+10 |
| * | | | | | | | Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband | Junio C Hamano | 2019-01-14 | 1 | -9/+11 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | pack-protocol.txt: accept error packets in any context | Masaya Suzuki | 2019-01-02 | 1 | -9/+11 |
* | | | | | | | | Merge branch 'js/filter-options-should-use-plain-int' | Junio C Hamano | 2019-02-05 | 2 | -3/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | filter-options: expand scaled numbers | Josh Steadmon | 2019-01-16 | 1 | -1/+7 |
| * | | | | | | | | list-objects-filter: teach tree:# how to handle >0 | Matthew DeVore | 2019-01-16 | 1 | -2/+7 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Fourth batch after 2.20 | Junio C Hamano | 2019-01-29 | 1 | -0/+54 |
* | | | | | | | | Merge branch 'it/log-format-source' | Junio C Hamano | 2019-01-29 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | log: add %S option (like --source) to log --format | Issac Trotts | 2019-01-11 | 1 | -0/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sb/submodule-recursive-fetch-gets-the-tip' | Junio C Hamano | 2019-01-29 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | sha1-array: provide oid_array_filter | Stefan Beller | 2018-12-05 | 1 | -0/+5 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pw/diff-color-moved-ws-fix' | Junio C Hamano | 2019-01-29 | 2 | -6/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: allow --no-color-moved-ws | Phillip Wood | 2019-01-10 | 1 | -0/+7 |
| * | | | | | | | | Use "whitespace" consistently | Phillip Wood | 2019-01-10 | 2 | -6/+6 |
| * | | | | | | | | diff: document --no-color-moved | Phillip Wood | 2019-01-10 | 1 | -0/+4 |
* | | | | | | | | | Merge branch 'ja/doc-build-l10n' | Junio C Hamano | 2019-01-29 | 1 | -5/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/Makefile add optional targets for l10n | Jean-Noel Avila | 2019-01-07 | 1 | -5/+17 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'js/rebase-i-redo-exec' | Junio C Hamano | 2019-01-29 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase: introduce a shortcut for --reschedule-failed-exec | Johannes Schindelin | 2018-12-11 | 1 | -0/+6 |
| * | | | | | | | | | rebase: add a config option to default to --reschedule-failed-exec | Johannes Schindelin | 2018-12-11 | 1 | -0/+5 |
| * | | | | | | | | | rebase: introduce --reschedule-failed-exec | Johannes Schindelin | 2018-12-11 | 1 | -0/+5 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cc/partial-clone-doc-typofix' | Junio C Hamano | 2019-01-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | partial-clone: add missing 'is' in doc | Christian Couder | 2019-01-14 | 1 | -1/+1 |
* | | | | | | | | | Third batch after 2.20 | Junio C Hamano | 2019-01-18 | 1 | -0/+80 |