summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* archive: read local configurationjc/setup-cleanup-fixJunio C Hamano2016-11-226-15/+40
* mailinfo: read local configurationJunio C Hamano2016-11-223-5/+29
* Git 2.11-rc2v2.11.0-rc2Junio C Hamano2016-11-172-1/+4
* Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano2016-11-175-8/+1
|\
| * diffcore-delta: remove unused parameter to diffcore_count_changes()tk/diffcore-delta-remove-unusedTobias Klauser2016-11-145-8/+1
* | Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano2016-11-174-13/+18
|\ \
| * | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-094-13/+18
* | | Merge branch 'nd/worktree-lock'Junio C Hamano2016-11-171-1/+1
|\ \ \
| * | | git-worktree.txt: fix typo "to"/"two", and add command/worktree-lockBen North2016-11-131-1/+1
* | | | Git 2.11.0-rc1v2.11.0-rc1Junio C Hamano2016-11-111-0/+7
* | | | Merge branch 'rt/fetch-pack-error-message-fix'Junio C Hamano2016-11-111-1/+1
|\ \ \ \
| * | | | fetch-pack.c: correct command at the beginning of an error messagert/fetch-pack-error-message-fixRalf Thielow2016-11-111-1/+1
* | | | | Merge branch 'ps/common-info-doc'Junio C Hamano2016-11-111-1/+1
|\ \ \ \ \
| * | | | | doc: fix location of 'info/' with $GIT_COMMON_DIRps/common-info-docPatrick Steinhardt2016-11-111-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'js/pwd-var-vs-pwd-cmd-fix'Junio C Hamano2016-11-112-3/+3
|\ \ \ \ \
| * | | | | t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variablesjs/pwd-var-vs-pwd-cmd-fixJohannes Sixt2016-11-112-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'ls/macos-update'Junio C Hamano2016-11-112-1/+3
|\ \ \ \ \
| * | | | | travis-ci: disable GIT_TEST_HTTPD for macOSls/macos-updateLars Schneider2016-11-101-1/+2
| * | | | | Makefile: set NO_OPENSSL on macOS by defaultLars Schneider2016-11-101-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-11-111-1/+1
|\ \ \ \ \
| * | | | | sequencer: silence -Wtautological-constant-out-of-range-compareJeff King2016-11-081-1/+1
* | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-11-111-2/+1
|\ \ \ \ \ \
| * | | | | | t0021: remove debugging cruftJunio C Hamano2016-11-111-2/+1
* | | | | | | Merge branch 'as/merge-attr-sleep'Junio C Hamano2016-11-111-5/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleepJohannes Sixt2016-11-111-1/+9
| * | | | | | t6026: ensure that long-running script really isJohannes Schindelin2016-11-101-4/+4
| * | | | | | Revert "t6026-merge-attr: don't fail if sleep exits early"Junio C Hamano2016-11-101-1/+1
| * | | | | | Revert "t6026-merge-attr: ensure that the merge driver was called"Junio C Hamano2016-11-101-2/+1
| * | | | | | t6026-merge-attr: ensure that the merge driver was calledAndreas Schwab2016-11-101-1/+2
| * | | | | | t6026-merge-attr: don't fail if sleep exits earlyAndreas Schwab2016-11-081-1/+1
* | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-11-102-1/+72
|\ \ \ \ \ \ \
| * | | | | | | alternates: re-allow relative paths from environmentjk/alt-odb-cleanupJeff King2016-11-082-1/+72
* | | | | | | | Merge branch 'jk/filter-process-fix'Junio C Hamano2016-11-102-15/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | t0021: fix filehandle usage on older perljk/filter-process-fixJeff King2016-11-021-0/+1
| * | | | | | | | t0021: use $PERL_PATH for rot13-filter.plJeff King2016-11-022-9/+11
| * | | | | | | | t0021: put $TEST_ROOT in $PATHJeff King2016-11-021-3/+4
| * | | | | | | | t0021: use write_script to create rot13 shell scriptJeff King2016-11-021-3/+1
* | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-11-101-5/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | t0021: compute file size with a single process instead of a pipelineJohannes Sixt2016-11-081-1/+1
| * | | | | | | | t0021: expect more variations in the output of uniq -cJohannes Sixt2016-11-081-4/+3
| |/ / / / / / /
* | | | | | | | A bit of updates post -rc0Junio C Hamano2016-11-011-7/+8
* | | | | | | | Merge branch 'cc/split-index-typofix'Junio C Hamano2016-11-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | split-index: s/eith/with/ typo fixcc/split-index-typofixChristian Couder2016-11-011-1/+1
* | | | | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-11-011-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_name: make wraparound of the index into ring-buffer explicitRené Scharfe2016-11-011-1/+2
* | | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-11-011-0/+15
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | cocci: avoid self-references in object_id transformationsrs/cocciRené Scharfe2016-11-011-0/+15
* | | | | | | | | | Git 2.11-rc0v2.11.0-rc0Junio C Hamano2016-10-312-28/+42
* | | | | | | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-10-312-3/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | valgrind: support test helpersnd/test-helpersRené Scharfe2016-10-272-3/+18