summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-11-11Merge branch 'ls/macos-update'Libravatar Junio C Hamano2-1/+3
2016-11-11Merge branch 'js/prepare-sequencer'Libravatar Junio C Hamano1-1/+1
2016-11-11Merge branch 'ls/filter-process'Libravatar Junio C Hamano1-2/+1
2016-11-11Merge branch 'as/merge-attr-sleep'Libravatar Junio C Hamano1-5/+13
2016-11-11t0021: remove debugging cruftLibravatar Junio C Hamano1-2/+1
2016-11-11t6026: clarify the point of "kill $(cat sleep.pid)"Libravatar Johannes Sixt1-1/+9
2016-11-10t6026: ensure that long-running script really isLibravatar Johannes Schindelin1-4/+4
2016-11-10Revert "t6026-merge-attr: don't fail if sleep exits early"Libravatar Junio C Hamano1-1/+1
2016-11-10Revert "t6026-merge-attr: ensure that the merge driver was called"Libravatar Junio C Hamano1-2/+1
2016-11-10Merge branch 'jk/alt-odb-cleanup'Libravatar Junio C Hamano2-1/+72
2016-11-10Merge branch 'jk/filter-process-fix'Libravatar Junio C Hamano2-15/+17
2016-11-10Merge branch 'ls/filter-process'Libravatar Junio C Hamano1-5/+4
2016-11-10t6026-merge-attr: ensure that the merge driver was calledLibravatar Andreas Schwab1-1/+2
2016-11-10travis-ci: disable GIT_TEST_HTTPD for macOSLibravatar Lars Schneider1-1/+2
2016-11-10Makefile: set NO_OPENSSL on macOS by defaultLibravatar Lars Schneider1-0/+1
2016-11-08sequencer: silence -Wtautological-constant-out-of-range-compareLibravatar Jeff King1-1/+1
2016-11-08t6026-merge-attr: don't fail if sleep exits earlyLibravatar Andreas Schwab1-1/+1
2016-11-08alternates: re-allow relative paths from environmentLibravatar Jeff King2-1/+72
2016-11-08t0021: compute file size with a single process instead of a pipelineLibravatar Johannes Sixt1-1/+1
2016-11-08t0021: expect more variations in the output of uniq -cLibravatar Johannes Sixt1-4/+3
2016-11-02t0021: fix filehandle usage on older perlLibravatar Jeff King1-0/+1
2016-11-02t0021: use $PERL_PATH for rot13-filter.plLibravatar Jeff King2-9/+11
2016-11-02t0021: put $TEST_ROOT in $PATHLibravatar Jeff King1-3/+4
2016-11-02t0021: use write_script to create rot13 shell scriptLibravatar Jeff King1-3/+1
2016-11-01A bit of updates post -rc0Libravatar Junio C Hamano1-7/+8
2016-11-01Merge branch 'cc/split-index-typofix'Libravatar Junio C Hamano1-1/+1
2016-11-01Merge branch 'jk/no-looking-at-dotgit-outside-repo'Libravatar Junio C Hamano1-1/+2
2016-11-01Merge branch 'rs/cocci'Libravatar Junio C Hamano1-0/+15
2016-11-01split-index: s/eith/with/ typo fixLibravatar Christian Couder1-1/+1
2016-11-01cocci: avoid self-references in object_id transformationsLibravatar René Scharfe1-0/+15
2016-11-01sha1_name: make wraparound of the index into ring-buffer explicitLibravatar René Scharfe1-1/+2
2016-10-31Git 2.11-rc0Libravatar Junio C Hamano2-28/+42
2016-10-31Merge branch 'nd/test-helpers'Libravatar Junio C Hamano2-3/+18
2016-10-31Merge branch 'sc/fmt-merge-msg-doc-markup-fix'Libravatar Junio C Hamano1-2/+2
2016-10-31Merge branch 'ak/sh-setup-dot-source-i18n-fix'Libravatar Junio C Hamano1-3/+3
2016-10-31Merge branch 'rs/commit-pptr-simplify'Libravatar Junio C Hamano1-8/+6
2016-10-31Merge branch 'jk/rebase-config-insn-fmt-docfix'Libravatar Junio C Hamano1-1/+1
2016-10-31Merge branch 'ak/pre-receive-hook-template-modefix'Libravatar Junio C Hamano1-0/+0
2016-10-31Merge branch 'jk/common-main'Libravatar Junio C Hamano1-2/+2
2016-10-31Merge branch 'aw/numbered-stash'Libravatar Junio C Hamano3-3/+50
2016-10-31Merge branch 'jt/trailer-with-cruft'Libravatar Junio C Hamano3-279/+654
2016-10-31Merge branch 'ls/filter-process'Libravatar Junio C Hamano19-135/+1498
2016-10-31Merge branch 'ls/git-open-cloexec'Libravatar Junio C Hamano5-14/+26
2016-10-30git-sh-setup: be explicit where to dot-source git-sh-i18n from.Libravatar Anders Kaseorg1-3/+3
2016-10-30commit: simplify building parents listLibravatar René Scharfe1-8/+6
2016-10-30doc: fix missing "::" in config listLibravatar Jeff King1-1/+1
2016-10-28pre-receive.sample: mark it executableLibravatar Anders Kaseorg1-0/+0
2016-10-28Sync with 2.10.2Libravatar Junio C Hamano2-1/+68
2016-10-28Git 2.10.2Libravatar Junio C Hamano3-2/+69
2016-10-28Merge branch 'pb/test-parse-options-expect' into maintLibravatar Junio C Hamano1-170/+13