summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config.c: mark error and warnings strings for translationmm/config-message-i18nMatthieu Moy2014-08-011-10/+10
* Sync with 2.0.4Junio C Hamano2014-07-303-1/+8
|\
| * 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
* | Update draft release notes to 2.1Junio C Hamano2014-07-301-3/+5
* | Merge branch 'jk/more-push-completion'Junio C Hamano2014-07-301-1/+27
|\ \
| * | completion: complete `git push --force-with-lease=`jk/more-push-completionJohn Keeping2014-07-221-1/+21
| * | completion: add some missing options to `git push`John Keeping2014-07-221-0/+1
| * | completion: complete "unstuck" `git push --recurse-submodules`John Keeping2014-07-221-0/+5
* | | Merge branch 'sk/mingw-tests-workaround'Junio C Hamano2014-07-308-24/+51
|\ \ \
| * | | t800[12]: work around MSys limitationsk/mingw-tests-workaroundKarsten Blees2014-07-211-0/+12
| * | | t9902: mingw-specific fix for gitfile link filesPat Thoyts2014-07-211-4/+13
| * | | t4210: skip command-line encoding tests on mingwPat Thoyts2014-07-211-2/+2
| * | | MinGW: disable legacy encoding testsKarsten Blees2014-07-213-15/+18
| * | | t0110/MinGW: skip tests that pass arbitrary bytes on the command lineKarsten Blees2014-07-211-2/+5
| * | | MinGW: Skip test redirecting to fd 4Johannes Schindelin2014-07-171-1/+1
* | | | 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
View Lorry Controller Status