summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sk/mingw-uni-fix-more'Junio C Hamano2014-07-308-150/+184
|\
| * Win32: enable color output in Windows cmd.exesk/mingw-uni-fix-moreKarsten Blees2014-07-211-0/+4
| * Win32: patch Windows environment on startupKarsten Blees2014-07-211-13/+12
| * Win32: keep the environment sortedKarsten Blees2014-07-211-39/+65
| * Win32: use low-level memory allocation during initializationKarsten Blees2014-07-211-15/+28
| * Win32: reduce environment array reallocationsKarsten Blees2014-07-211-27/+35
| * Win32: don't copy the environment twice when spawning child processesKarsten Blees2014-07-213-64/+30
| * Win32: factor out environment block creationKarsten Blees2014-07-211-23/+32
| * Win32: unify environment function namesKarsten Blees2014-07-211-7/+7
| * Win32: unify environment case-sensitivityKarsten Blees2014-07-211-2/+1
| * Win32: fix environment memory leaksKarsten Blees2014-07-213-6/+7
| * Win32: Unicode environment (incoming)Karsten Blees2014-07-212-0/+17
| * Win32: Unicode environment (outgoing)Karsten Blees2014-07-211-11/+14
| * Revert "Windows: teach getenv to do a case-sensitive search"Karsten Blees2014-07-171-20/+3
| * tests: do not pass iso8859-1 encoded parameterPat Thoyts2014-07-154-7/+13
* | Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-07-301-2/+8
|\ \
| * | t9814: fix misconversion from test $a -o $b to test $a || test $bep/avoid-test-a-oJunio C Hamano2014-07-251-2/+8
* | | Merge branch 'maint'Junio C Hamano2014-07-281-0/+10
|\ \ \
| * | | 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
| |/ / /
* | | | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-287-13/+16
|\ \ \ \
| * | | | apply: avoid possible bogus pointerjk/misc-fixes-maintJeff King2014-07-241-1/+1
| * | | | fix memory leak parsing core.commentcharJeff King2014-07-241-5/+5
| * | | | transport: fix leaks in refs_from_alternate_cbJeff King2014-07-241-2/+3
| * | | | free ref string returned by dwim_refJeff King2014-07-243-1/+5
| * | | | receive-pack: don't copy "dir" parameterJeff King2014-07-241-2/+2
* | | | | t1402: check for refs ending with a dotJeff King2014-07-281-0/+1
* | | | | Revert "Merge branch 'dt/refs-check-refname-component-sse'"Junio C Hamano2014-07-284-250/+18
* | | | | Revert "Merge branch 'dt/refs-check-refname-component-sse-fix'"Junio C Hamano2014-07-282-13/+5
* | | | | Git 2.1.0-rc0v2.1.0-rc0Junio C Hamano2014-07-272-1/+23
* | | | | Merge branch 'jk/rebase-am-fork-point'Junio C Hamano2014-07-274-8/+41
|\ \ \ \ \
| * | | | | rebase: omit patch-identical commits with --fork-pointjk/rebase-am-fork-pointJohn Keeping2014-07-164-6/+32
| * | | | | rebase--am: use --cherry-pick instead of --ignore-if-in-upstreamJohn Keeping2014-07-151-4/+11
* | | | | | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-276-26/+313
|\ \ \ \ \ \
| * | | | | | replace: add test for --graft with a mergetagcc/replace-graftChristian Couder2014-07-211-0/+22
| * | | | | | replace: check mergetags when using --graftChristian Couder2014-07-211-0/+47
| * | | | | | replace: add test for --graft with signed commitChristian Couder2014-07-211-0/+24
| * | | | | | replace: remove signature when using --graftChristian Couder2014-07-213-0/+41
| * | | | | | contrib: add convert-grafts-to-replace-refs.shChristian Couder2014-07-212-1/+31
| * | | | | | Documentation: replace: add --graft optionChristian Couder2014-07-211-0/+8
| * | | | | | replace: add test for --graftChristian Couder2014-07-211-1/+44
| * | | | | | replace: add --graft optionChristian Couder2014-07-211-1/+73