summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | | l10n: zh_CN: for git v2.11.0 l10n round 1Jiang Xin2016-11-211-2002/+2897
| | * | | | | | | | | | | | | | | | | | | | | | | l10n: pt_PT: update Portuguese translationVasco Almeida2016-11-131-2027/+2947
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/gitJiang Xin2016-11-091-2047/+2922
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | l10n: fr.po fix grammar mistakesjfbu2016-11-061-11/+7
| | | * | | | | | | | | | | | | | | | | | | | | | | l10n: fr.po v2.11.0_rnd1Jean-Noel Avila2016-11-051-2037/+2916
| | * | | | | | | | | | | | | | | | | | | | | | | | l10n: sv.po: Update Swedish translation (2913t0f0u)Peter Krefting2016-11-051-2019/+2936
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2016-11-051-2230/+2946
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2016-11-041-2230/+2946
| | * | | | | | | | | | | | | | | | | | | | | | | | | l10n: vi.po: Updated translation to v2.11.0 (2913t)Tran Ngoc Quan2016-11-041-2016/+2930
| | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-11-021-1773/+2656
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-10-161-1773/+2656
| | * | | | | | | | | | | | | | | | | | | | | | | | l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)Jiang Xin2016-11-011-1952/+2742
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | i18n: fix unmatched single quote in error messagejs/prepare-sequencerJiang Xin2016-11-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |