Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mru: use double-linked list from list.hot/mru-on-list | Olga Telezhnaya | 2017-10-01 | 4 | -59/+33 |
* | The tenth batch for 2.15 | Junio C Hamano | 2017-09-28 | 1 | -0/+47 |
* | Merge branch 'js/win32-lazyload-dll' | Junio C Hamano | 2017-09-28 | 1 | -0/+57 |
|\ | |||||
| * | Win32: simplify loading of DLL functionsjs/win32-lazyload-dll | Johannes Schindelin | 2017-09-26 | 1 | -0/+57 |
* | | Merge branch 'jc/merge-x-theirs-docfix' | Junio C Hamano | 2017-09-28 | 1 | -1/+2 |
|\ \ | |||||
| * | | merge-strategies: avoid implying that "-s theirs" existsjc/merge-x-theirs-docfix | Junio C Hamano | 2017-09-25 | 1 | -1/+2 |
* | | | Merge branch 'ks/doc-use-camelcase-for-config-name' | Junio C Hamano | 2017-09-28 | 2 | -3/+3 |
|\ \ \ | |||||
| * | | | doc: camelCase the config variables to improve readabilityks/doc-use-camelcase-for-config-name | Kaartic Sivaraam | 2017-09-25 | 2 | -3/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'mk/diff-delta-avoid-large-offset' | Junio C Hamano | 2017-09-28 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | diff-delta: do not allow delta offset truncationmk/diff-delta-avoid-large-offset | Martin Koegler | 2017-08-11 | 1 | -0/+3 |
* | | | | Merge branch 'mk/diff-delta-uint-may-be-shorter-than-ulong' | Junio C Hamano | 2017-09-28 | 1 | -11/+13 |
|\ \ \ \ | |||||
| * | | | | diff-delta: fix encoding size that would not fit in "unsigned int"mk/diff-delta-uint-may-be-shorter-than-ulong | Martin Koegler | 2017-08-10 | 1 | -11/+13 |
| |/ / / | |||||
* | | | | Merge branch 'rs/resolve-ref-optional-result' | Junio C Hamano | 2017-09-28 | 17 | -46/+29 |
|\ \ \ \ | |||||
| * | | | | refs: pass NULL to resolve_ref_unsafe() if hash is not needed | René Scharfe | 2017-09-24 | 14 | -38/+19 |
| * | | | | refs: pass NULL to refs_resolve_ref_unsafe() if hash is not needed | René Scharfe | 2017-09-24 | 2 | -4/+2 |
| * | | | | refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional | René Scharfe | 2017-09-24 | 2 | -4/+8 |
* | | | | | Merge branch 'rs/mailinfo-qp-decode-fix' | Junio C Hamano | 2017-09-28 | 1 | -3/+8 |
|\ \ \ \ \ | |||||
| * | | | | | mailinfo: don't decode invalid =XY quoted-printable sequencesrs/mailinfo-qp-decode-fix | René Scharfe | 2017-09-24 | 1 | -3/+8 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' | Junio C Hamano | 2017-09-28 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | doc: put literal block delimiter around tablejk/doc-read-tree-table-asciidoctor-fix | Jeff King | 2017-09-24 | 1 | -0/+2 |
* | | | | | | Merge branch 'ik/userdiff-html-h-element-fix' | Junio C Hamano | 2017-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | userdiff: fix HTML hunk header regexpik/userdiff-html-h-element-fix | Ilya Kantor | 2017-09-24 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/fallthrough' | Junio C Hamano | 2017-09-28 | 15 | -28/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | consistently use "fallthrough" comments in switchesjk/fallthrough | Jeff King | 2017-09-22 | 13 | -4/+15 |
| * | | | | | | curl_trace(): eliminate switch fallthrough | Jeff King | 2017-09-22 | 1 | -3/+4 |
| * | | | | | | test-line-buffer: simplify command parsing | Jeff King | 2017-09-22 | 1 | -21/+11 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/diff-blob' | Junio C Hamano | 2017-09-28 | 2 | -2/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cat-file: handle NULL object_context.pathjk/diff-blob | Jeff King | 2017-09-22 | 2 | -2/+7 |
* | | | | | | | Merge branch 'hn/typofix' | Junio C Hamano | 2017-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule.h: typofixhn/typofix | Han-Wen Nienhuys | 2017-09-22 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger' | Junio C Hamano | 2017-09-28 | 2 | -8/+94 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | filter-branch: use hash-object instead of mktagic/fix-filter-branch-to-handle-tag-without-tagger | Ian Campbell | 2017-09-22 | 1 | -1/+1 |
| * | | | | | | | filter-branch: stash away ref map in a branch | Ian Campbell | 2017-09-22 | 2 | -2/+55 |
| * | | | | | | | filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_* | Ian Campbell | 2017-09-22 | 1 | -0/+33 |
| * | | | | | | | filter-branch: reset $GIT_* before cleaning up | Ian Campbell | 2017-09-22 | 1 | -5/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/describe-omit-some-refs' | Junio C Hamano | 2017-09-28 | 2 | -4/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refs | Max Kirillov | 2017-09-17 | 2 | -4/+11 |
* | | | | | | | | Sync with 2.14.2 | Junio C Hamano | 2017-09-26 | 11 | -56/+183 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 2.14.2v2.14.2 | Junio C Hamano | 2017-09-22 | 1 | -0/+11 |
| * | | | | | | | | Sync with 2.13.6 | Junio C Hamano | 2017-09-22 | 10 | -56/+172 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Git 2.13.6v2.13.6maint-2.13 | Junio C Hamano | 2017-09-22 | 3 | -2/+19 |
| | * | | | | | | | Sync with 2.12.5 | Junio C Hamano | 2017-09-22 | 9 | -56/+155 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Git 2.12.5v2.12.5maint-2.12 | Junio C Hamano | 2017-09-22 | 3 | -2/+19 |
| | | * | | | | | | | Sync with 2.11.4 | Junio C Hamano | 2017-09-22 | 8 | -56/+138 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
| | | | * | | | | | | Git 2.11.4v2.11.4maint-2.11 | Junio C Hamano | 2017-09-22 | 3 | -2/+19 |
| | | | * | | | | | | Sync with 2.10.5 | Junio C Hamano | 2017-09-22 | 7 | -56/+121 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Git 2.10.5v2.10.5maint-2.10 | Junio C Hamano | 2017-09-22 | 3 | -2/+19 |
| | | | | * | | | | | | Merge branch 'jk/safe-pipe-capture' into maint-2.10 | Junio C Hamano | 2017-09-22 | 1 | -2/+2 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * | | | | | | archimport: use safe_pipe_capture for user inputjk/safe-pipe-capture | Jeff King | 2017-09-12 | 1 | -2/+2 |
| | | | | * | | | | | | | Merge branch 'jk/cvsimport-quoting' into maint-2.10 | Junio C Hamano | 2017-09-22 | 1 | -0/+1 |
| | | | | |\ \ \ \ \ \ \ |