Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.10.3v2.10.3 | Junio C Hamano | 2017-05-05 | 3 | -2/+10 |
* | Merge branch 'maint-2.9' into maint-2.10 | Junio C Hamano | 2017-05-05 | 8 | -7/+83 |
|\ | |||||
| * | Git 2.9.4v2.9.4 | Junio C Hamano | 2017-05-05 | 3 | -2/+11 |
| * | Merge branch 'maint-2.8' into maint-2.9 | Junio C Hamano | 2017-05-05 | 7 | -6/+74 |
| |\ | |||||
| | * | Git 2.8.5v2.8.5 | Junio C Hamano | 2017-05-05 | 4 | -3/+16 |
| | * | Merge branch 'maint-2.7' into maint-2.8 | Junio C Hamano | 2017-05-05 | 6 | -5/+60 |
| | |\ | |||||
| | | * | Git 2.7.5v2.7.5 | Junio C Hamano | 2017-05-05 | 4 | -3/+19 |
| | | * | Merge branch 'maint-2.6' into maint-2.7 | Junio C Hamano | 2017-05-05 | 5 | -4/+43 |
| | | |\ | |||||
| | | | * | Git 2.6.7v2.6.7maint-2.6 | Junio C Hamano | 2017-05-05 | 4 | -3/+16 |
| | | | * | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2017-05-05 | 4 | -3/+29 |
| | | | |\ | |||||
| | | | | * | Git 2.5.6v2.5.6maint-2.5 | Junio C Hamano | 2017-05-05 | 4 | -3/+16 |
| | | | | * | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2017-05-05 | 3 | -2/+15 |
| | | | | |\ | |||||
| | | | | | * | Git 2.4.12v2.4.12maint-2.4 | Junio C Hamano | 2017-05-05 | 4 | -3/+16 |
| | | | | | * | Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4 | Junio C Hamano | 2017-05-05 | 1 | -1/+1 |
| | | | | | |\ | |||||
| | | | | | | * | shell: disallow repo names beginning with dashjk/shell-no-repository-that-begins-with-dash | Jeff King | 2017-05-05 | 1 | -1/+1 |
| | | | | | |/ | |||||
* | | | | | | | preparing for 2.10.3 | Junio C Hamano | 2016-12-05 | 2 | -1/+49 |
* | | | | | | | Merge branch 'jk/common-main' into maint-2.10 | Junio C Hamano | 2016-12-05 | 5 | -11/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | common-main: stop munging argv[0] pathjk/common-main | Jeff King | 2016-11-29 | 4 | -9/+10 |
| * | | | | | | | git-compat-util: move content inside ifdef/endif guards | Jeff King | 2016-10-27 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'tk/diffcore-delta-remove-unused' into maint | Junio C Hamano | 2016-11-29 | 5 | -8/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diffcore-delta: remove unused parameter to diffcore_count_changes()tk/diffcore-delta-remove-unused | Tobias Klauser | 2016-11-14 | 5 | -8/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/create-branch-remove-unused-param' into maint | Junio C Hamano | 2016-11-29 | 4 | -13/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-param | Jeff King | 2016-11-09 | 4 | -13/+18 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/worktree-lock' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-worktree.txt: fix typo "to"/"two", and add command/worktree-lock | Ben North | 2016-11-13 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'ps/common-info-doc' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: fix location of 'info/' with $GIT_COMMON_DIRps/common-info-doc | Patrick Steinhardt | 2016-11-11 | 1 | -1/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-11-29 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cocci: avoid self-references in object_id transformationsrs/cocci | René Scharfe | 2016-11-01 | 1 | -0/+15 |
* | | | | | | | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-11-29 | 2 | -3/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | valgrind: support test helpersnd/test-helpers | René Scharfe | 2016-10-27 | 2 | -3/+18 |
* | | | | | | | | | | | Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint | Junio C Hamano | 2016-11-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Documentation/fmt-merge-msg: fix markup in examplesc/fmt-merge-msg-doc-markup-fix | Stefan Christ | 2016-10-28 | 1 | -2/+2 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rs/commit-pptr-simplify' into maint | Junio C Hamano | 2016-11-29 | 1 | -8/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | commit: simplify building parents listrs/commit-pptr-simplify | René Scharfe | 2016-10-30 | 1 | -8/+6 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint | Junio C Hamano | 2016-11-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | doc: fix missing "::" in config listjk/rebase-config-insn-fmt-docfix | Jeff King | 2016-10-30 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'ak/pre-receive-hook-template-modefix' into maint | Junio C Hamano | 2016-11-29 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | pre-receive.sample: mark it executableak/pre-receive-hook-template-modefix | Anders Kaseorg | 2016-10-28 | 1 | -0/+0 |
* | | | | | | | | | | | | Merge branch 'ls/macos-update' into maint | Junio C Hamano | 2016-11-29 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | travis-ci: disable GIT_TEST_HTTPD for macOSls/macos-update | Lars Schneider | 2016-11-10 | 1 | -1/+2 |
| * | | | | | | | | | | | | Makefile: set NO_OPENSSL on macOS by default | Lars Schneider | 2016-11-10 | 1 | -0/+1 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'as/merge-attr-sleep' into maint | Junio C Hamano | 2016-11-29 | 1 | -5/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleep | Johannes Sixt | 2016-11-11 | 1 | -1/+9 |
| * | | | | | | | | | | | | t6026: ensure that long-running script really is | Johannes Schindelin | 2016-11-10 | 1 | -4/+4 |
| * | | | | | | | | | | | | Revert "t6026-merge-attr: don't fail if sleep exits early" | Junio C Hamano | 2016-11-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | Revert "t6026-merge-attr: ensure that the merge driver was called" | Junio C Hamano | 2016-11-10 | 1 | -2/+1 |
| * | | | | | | | | | | | | t6026-merge-attr: ensure that the merge driver was called | Andreas Schwab | 2016-11-10 | 1 | -1/+2 |
| * | | | | | | | | | | | | t6026-merge-attr: don't fail if sleep exits early | Andreas Schwab | 2016-11-08 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maint | Junio C Hamano | 2016-11-29 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |