summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7610-mergetool: add test cases for mergetool.writeToTempda/mergetool-temporary-directoryDavid Aguilar2014-10-161-0/+23
* mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-162-4/+37
* mergetool: use more conservative temporary filenamesda/mergetool-temporary-filenameDavid Aguilar2014-10-161-5/+11
* test-lib-functions: adjust style to match CodingGuidelinesda/mergetool-testsDavid Aguilar2014-10-161-12/+18
* t7610-mergetool: use test_config to isolate testsDavid Aguilar2014-10-161-5/+3
* t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar2014-10-151-8/+2
* t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar2014-10-151-459/+459
* Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2014-10-071-1/+1
|\
| * Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-10-071-1/+1
| |\
| | * git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-071-1/+1
* | | Git 2.0.4v2.0.4Junio C Hamano2014-07-304-3/+9
* | | commit --amend: test specifies authorship but forgets to checkFabian Ruch2014-07-301-0/+1
* | | t4013: test diff-tree's --stdin commit formattingJeff King2014-07-281-0/+10
* | | Merge branch 'jk/alloc-commit-id-maint' into maintJunio C Hamano2014-07-2811-89/+103
|\ \ \
| * | | diff-tree: avoid lookup_unknown_objectjk/alloc-commit-id-maintJeff King2014-07-281-3/+1
| * | | object_as_type: set commit indexJeff King2014-07-281-0/+2
| * | | alloc: factor out commit indexJeff King2014-07-282-2/+8
| * | | add object_as_type helper for casting objectsJeff King2014-07-287-43/+25
| * | | parse_object_buffer: do not set object typeJeff King2014-07-281-2/+0
| * | | move setting of object->type to alloc_* functionsJeff King2014-07-288-12/+13
| * | | alloc: write out allocator definitionsJeff King2014-07-281-11/+27
| * | | alloc.c: remove the alloc_raw_commit_node() functionRamsay Jones2014-07-281-18/+29
|/ / /
* | | Git 2.0.3v2.0.3Junio C Hamano2014-07-234-3/+21
* | | .mailmap: combine Stefan Beller's emailsStefan Beller2014-07-231-0/+1
* | | git.1: switch homepage for statsStefan Beller2014-07-231-1/+1
* | | Merge branch 'ah/fix-http-push' into maintJunio C Hamano2014-07-221-1/+1
|\ \ \
| * | | http-push.c: make CURLOPT_IOCTLDATA a usable pointerah/fix-http-pushAbbaad Haider2014-07-131-1/+1
* | | | Merge branch 'po/error-message-style' into maintJunio C Hamano2014-07-221-0/+9
|\ \ \ \
| * | | | doc: give some guidelines for error messagespo/error-message-stylePhilip Oakley2014-07-101-0/+9
* | | | | Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2014-07-222-0/+32
|\ \ \ \ \
| * | | | | log: fix indentation for --graph --show-signaturezk/log-graph-showsigZoltan Klinger2014-07-092-0/+32
| | |/ / / | |/| | |
* | | | | Merge branch 'mg/fix-log-mergetag-color' into maintJunio C Hamano2014-07-221-10/+11
|\ \ \ \ \
| * | | | | 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