summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mru: Replace mru.[ch] with list.h implementationgs/retire-mruGargi Sharma2018-01-247-86/+17
* mru: use double-linked list from list.hot/mru-on-listOlga Telezhnaya2017-10-014-59/+33
* The tenth batch for 2.15Junio C Hamano2017-09-281-0/+47
* Merge branch 'js/win32-lazyload-dll'Junio C Hamano2017-09-281-0/+57
|\
| * Win32: simplify loading of DLL functionsjs/win32-lazyload-dllJohannes Schindelin2017-09-261-0/+57
* | Merge branch 'jc/merge-x-theirs-docfix'Junio C Hamano2017-09-281-1/+2
|\ \
| * | merge-strategies: avoid implying that "-s theirs" existsjc/merge-x-theirs-docfixJunio C Hamano2017-09-251-1/+2
* | | Merge branch 'ks/doc-use-camelcase-for-config-name'Junio C Hamano2017-09-282-3/+3
|\ \ \
| * | | doc: camelCase the config variables to improve readabilityks/doc-use-camelcase-for-config-nameKaartic Sivaraam2017-09-252-3/+3
| | |/ | |/|
* | | Merge branch 'mk/diff-delta-avoid-large-offset'Junio C Hamano2017-09-281-0/+3
|\ \ \
| * | | diff-delta: do not allow delta offset truncationmk/diff-delta-avoid-large-offsetMartin Koegler2017-08-111-0/+3
* | | | Merge branch 'mk/diff-delta-uint-may-be-shorter-than-ulong'Junio C Hamano2017-09-281-11/+13
|\ \ \ \
| * | | | diff-delta: fix encoding size that would not fit in "unsigned int"mk/diff-delta-uint-may-be-shorter-than-ulongMartin Koegler2017-08-101-11/+13
| |/ / /
* | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-09-2817-46/+29
|\ \ \ \
| * | | | refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-2414-38/+19
| * | | | refs: pass NULL to refs_resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-242-4/+2
| * | | | refs: make sha1 output parameter of refs_resolve_ref_unsafe() optionalRené Scharfe2017-09-242-4/+8
* | | | | Merge branch 'rs/mailinfo-qp-decode-fix'Junio C Hamano2017-09-281-3/+8
|\ \ \ \ \
| * | | | | mailinfo: don't decode invalid =XY quoted-printable sequencesrs/mailinfo-qp-decode-fixRené Scharfe2017-09-241-3/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'Junio C Hamano2017-09-281-0/+2
|\ \ \ \ \
| * | | | | doc: put literal block delimiter around tablejk/doc-read-tree-table-asciidoctor-fixJeff King2017-09-241-0/+2
* | | | | | Merge branch 'ik/userdiff-html-h-element-fix'Junio C Hamano2017-09-281-1/+1
|\ \ \ \ \ \
| * | | | | | userdiff: fix HTML hunk header regexpik/userdiff-html-h-element-fixIlya Kantor2017-09-241-1/+1
| |/ / / / /
* | | | | | Merge branch 'jk/fallthrough'Junio C Hamano2017-09-2815-28/+30
|\ \ \ \ \ \
| * | | | | | consistently use "fallthrough" comments in switchesjk/fallthroughJeff King2017-09-2213-4/+15
| * | | | | | curl_trace(): eliminate switch fallthroughJeff King2017-09-221-3/+4
| * | | | | | test-line-buffer: simplify command parsingJeff King2017-09-221-21/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/diff-blob'Junio C Hamano2017-09-282-2/+7
|\ \ \ \ \ \
| * | | | | | cat-file: handle NULL object_context.pathjk/diff-blobJeff King2017-09-222-2/+7
* | | | | | | Merge branch 'hn/typofix'Junio C Hamano2017-09-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | submodule.h: typofixhn/typofixHan-Wen Nienhuys2017-09-221-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger'Junio C Hamano2017-09-282-8/+94
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: use hash-object instead of mktagic/fix-filter-branch-to-handle-tag-without-taggerIan Campbell2017-09-221-1/+1
| * | | | | | | filter-branch: stash away ref map in a branchIan Campbell2017-09-222-2/+55
| * | | | | | | filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_*Ian Campbell2017-09-221-0/+33
| * | | | | | | filter-branch: reset $GIT_* before cleaning upIan Campbell2017-09-221-5/+5
| |/ / / / / /
* | | | | | | Merge branch 'jk/describe-omit-some-refs'Junio C Hamano2017-09-282-4/+11
|\ \ \ \ \ \ \
| * | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refsMax Kirillov2017-09-172-4/+11
* | | | | | | | Sync with 2.14.2Junio C Hamano2017-09-2611-56/+183
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.14.2v2.14.2Junio C Hamano2017-09-221-0/+11
| * | | | | | | | Sync with 2.13.6Junio C Hamano2017-09-2210-56/+172
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Git 2.13.6v2.13.6maint-2.13Junio C Hamano2017-09-223-2/+19
| | * | | | | | | Sync with 2.12.5Junio C Hamano2017-09-229-56/+155
| | |\ \ \ \ \ \ \
| | | * | | | | | | Git 2.12.5v2.12.5maint-2.12Junio C Hamano2017-09-223-2/+19
| | | * | | | | | | Sync with 2.11.4Junio C Hamano2017-09-228-56/+138
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | | * | | | | | Git 2.11.4v2.11.4maint-2.11Junio C Hamano2017-09-223-2/+19
| | | | * | | | | | Sync with 2.10.5Junio C Hamano2017-09-227-56/+121
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Git 2.10.5v2.10.5maint-2.10Junio C Hamano2017-09-223-2/+19
| | | | | * | | | | | Merge branch 'jk/safe-pipe-capture' into maint-2.10Junio C Hamano2017-09-221-2/+2
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | archimport: use safe_pipe_capture for user inputjk/safe-pipe-captureJeff King2017-09-121-2/+2
View Lorry Controller Status