summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/msys2'Junio C Hamano2016-01-287-12/+77
|\
| * mingw: uglify (a, 0) definitions to shut up warningsjs/msys2Johannes Schindelin2016-01-152-2/+6
| * mingw: squash another warning about a castJohannes Schindelin2016-01-151-1/+1
| * mingw: avoid warnings when casting HANDLEs to intJohannes Schindelin2016-01-153-5/+9
| * mingw: avoid redefining S_* constantsJohannes Schindelin2016-01-151-0/+4
| * compat/winansi: support compiling with MSys2Johannes Schindelin2016-01-141-0/+2
| * compat/mingw: support MSys2-based MinGW buildJohannes Schindelin2016-01-141-1/+23
| * nedmalloc: allow compiling with MSys2's compilerJohannes Schindelin2016-01-141-0/+4
| * config.mak.uname: supporting 64-bit MSys2Johannes Schindelin2016-01-131-3/+11
| * config.mak.uname: support MSys2Johannes Schindelin2016-01-131-2/+19
* | Merge branch 'tk/interpret-trailers-in-place'Junio C Hamano2016-01-285-20/+129
|\ \
| * | interpret-trailers: add option for in-place editingtk/interpret-trailers-in-placeTobias Klauser2016-01-145-7/+114
| * | trailer: allow to write to files other than stdoutTobias Klauser2016-01-141-13/+15
| |/
* | Merge branch 'jk/sanity'Junio C Hamano2016-01-281-5/+13
|\ \
| * | test-lib: clarify and tighten SANITYjk/sanityJunio C Hamano2016-01-191-5/+13
* | | Merge branch 'jk/filter-branch-no-index'Junio C Hamano2016-01-282-1/+9
|\ \ \
| * | | filter-branch: resolve $commit^{tree} in no-index casejk/filter-branch-no-indexJeff King2016-01-192-1/+9
* | | | Third batch for 2.8 cycleJunio C Hamano2016-01-261-0/+24
* | | | Merge branch 'jk/symbolic-ref'Junio C Hamano2016-01-266-77/+140
|\ \ \ \
| * | | | lock_ref_sha1_basic: handle REF_NODEREF with invalid refsjk/symbolic-refJeff King2016-01-133-9/+50
| * | | | lock_ref_sha1_basic: always fill old_oid while holding lockJeff King2016-01-131-6/+11
| * | | | checkout,clone: check return value of create_symrefJeff King2016-01-123-5/+15
| * | | | create_symref: write reflog while holding lockJeff King2015-12-291-1/+2
| * | | | create_symref: use existing ref-lock codeJeff King2015-12-292-55/+62
| * | | | create_symref: modernize variable namesJeff King2015-12-292-22/+21
* | | | | Merge branch 'ak/format-patch-odir-config'Junio C Hamano2016-01-264-1/+30
|\ \ \ \ \
| * | | | | format-patch: introduce format.outputDirectory configurationak/format-patch-odir-configAlexander Kuleshov2016-01-134-1/+30
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rp/p4-filetype-change'Junio C Hamano2016-01-262-2/+73
|\ \ \ \ \
| * | | | | git-p4.py: add support for filetype changerp/p4-filetype-changeRomain Picard2016-01-132-2/+73
* | | | | | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-01-265-0/+18
|\ \ \ \ \ \
| * | | | | | receive-pack: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | | | | merge: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | | | | am: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | | | | fetch: release pack files before garbage-collectingJohannes Schindelin2016-01-132-0/+15
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'Junio C Hamano2016-01-261-1/+1
|\ \ \ \ \ \
| * | | | | | rebase: ignore failures from "gc --auto"jk/ok-to-fail-gc-auto-in-rebaseJeff King2016-01-131-1/+1
* | | | | | | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-266-7/+32
|\ \ \ \ \ \ \
| * | | | | | | completion: add missing branch.*.rebase valuesjs/pull-rebase-iJohannes Schindelin2016-01-131-1/+1
| * | | | | | | remote: handle the config setting branch.*.rebase=interactiveJohannes Schindelin2016-01-131-3/+7
| * | | | | | | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-134-3/+24
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ep/shell-command-substitution-style'Junio C Hamano2016-01-2291-400/+400
|\ \ \ \ \ \ \
| * | | | | | | t9901-git-web--browse.sh: use the $( ... ) construct for command substitutionep/shell-command-substitution-styleElia Pinto2016-01-121-1/+1
| * | | | | | | t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for comman...Elia Pinto2016-01-121-3/+3
| * | | | | | | t9350-fast-export.sh: use the $( ... ) construct for command substitutionElia Pinto2016-01-121-3/+3
| * | | | | | | t9300-fast-import.sh: use the $( ... ) construct for command substitutionElia Pinto2016-01-121-34/+34
| * | | | | | | t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitutionElia Pinto2016-01-121-1/+1
| * | | | | | | t9145-git-svn-master-branch.sh: use the $( ... ) construct for command substi...Elia Pinto2016-01-121-2/+2
| * | | | | | | t9138-git-svn-authors-prog.sh: use the $( ... ) construct for command substit...Elia Pinto2016-01-121-1/+1
| * | | | | | | t9137-git-svn-dcommit-clobber-series.sh: use the $( ... ) construct for comma...Elia Pinto2016-01-121-12/+12
| * | | | | | | t9132-git-svn-broken-symlink.sh: use the $( ... ) construct for command subst...Elia Pinto2016-01-121-2/+2
View Lorry Controller Status