summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | log: correctly identify mergetag signature verification statusmg/fix-log-mergetag-colorMichael J Gruber2014-07-101-10/+11
* | | | | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2014-07-222-1/+18
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-mergesCharles Bailey2014-07-012-1/+18
* | | | | | | | Merge branch 'ye/doc-http-proto' into maintJunio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616ye/doc-http-protoYi EungJun2014-06-161-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jm/api-strbuf-doc' into maintJunio C Hamano2014-07-221-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | api-strbuf.txt minor typosjm/api-strbuf-docJeremiah Mahler2014-06-091-5/+5
* | | | | | | | | Merge branch 'jm/dedup-test-config' into maintJunio C Hamano2014-07-221-5/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/t7810-grep.sh: remove duplicate test_config()jm/dedup-test-configJeremiah Mahler2014-06-051-5/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sk/test-cmp-bin' into maintJunio C Hamano2014-07-225-22/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5000, t5003: do not use test_cmp to compare binary filessk/test-cmp-binStepan Kasal2014-06-045-22/+28
* | | | | | | | | | Merge branch 'jm/doc-wording-tweaks' into maintJunio C Hamano2014-07-222-9/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: wording fixes in the user manual and glossaryjm/doc-wording-tweaksJeremiah Mahler2014-05-282-9/+8
* | | | | | | | | | | Merge branch 'jm/instaweb-apache-24' into maintJunio C Hamano2014-07-221-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-instaweb: add support for Apache 2.4jm/instaweb-apache-24Jonathan McCrohan2014-05-271-1/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-2212-21/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | transport-helper.c: rearrange xcalloc argumentsbg/xcalloc-nmemb-then-sizeBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | reflog-walk.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-4/+4
| * | | | | | | | | | | pack-revindex.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | notes.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-3/+3
| * | | | | | | | | | | imap-send.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | http-push.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | diff.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | config.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-2/+2
| * | | | | | | | | | | commit.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | builtin/remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-4/+4
| * | | | | | | | | | | builtin/ls-remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cb/byte-order' into maintJunio C Hamano2014-07-221-9/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | compat/bswap.h: fix endianness detectioncb/byte-orderBen Walton2014-05-301-1/+1
| * | | | | | | | | | | compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIANJunio C Hamano2014-05-021-7/+7
| * | | | | | | | | | | compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDERCharles Bailey2014-05-021-9/+24
* | | | | | | | | | | | Merge branch 'lt/request-pull' into maintJunio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix brown paper bag breakage in t5150-request-pull.shlt/request-pullJohannes Sixt2014-06-021-1/+1
* | | | | | | | | | | | | Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano2014-07-225-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-varsJunio C Hamano2014-05-232-2/+10
| * | | | | | | | | | | | | scripts: "export VAR=VALUE" construct is not portableElia Pinto2014-05-233-3/+6
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Documentation: fix missing text for rev-parse --verifybrian m. carlson2014-07-221-1/+1
* | | | | | | | | | | | | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-216-19/+6
* | | | | | | | | | | | | use xcalloc() to allocate zero-initialized memoryRené Scharfe2014-07-214-8/+4
* | | | | | | | | | | | | Git 2.0.2v2.0.2Junio C Hamano2014-07-163-2/+22
* | | | | | | | | | | | | Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maintJunio C Hamano2014-07-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | builtin/clone.c: detect a clone starting at a tag correctlyjc/fix-clone-single-starting-at-a-tagJunio C Hamano2014-06-231-1/+1
* | | | | | | | | | | | | | Merge branch 'jk/pretty-G-format-fixes' into maintJunio C Hamano2014-07-163-9/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | move "%G" format test from t7510 to t6006jk/pretty-G-format-fixesJeff King2014-06-252-6/+6
| * | | | | | | | | | | | | | pretty: avoid reading past end-of-string with "%G"Jeff King2014-06-172-0/+8
| * | | | | | | | | | | | | | t7510: check %G* pretty-format outputJeff King2014-06-171-0/+40
| * | | | | | | | | | | | | | t7510: test a commit signed by an unknown keyJeff King2014-06-171-0/+13