Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | DONTMERGE git-p4: "name-rev HEAD" is not a way to find the current branchjc/p4-current-branch-fix | Junio C Hamano | 2017-03-27 | 2 | -2/+2 |
* | git-p4: add failing test for name-rev rather than symbolic-ref | Luke Diamand | 2017-03-26 | 1 | -0/+16 |
* | git-p4: work with a detached headld/p4-detached-head | Luke Diamand | 2015-11-24 | 2 | -8/+17 |
* | git-p4: add option to system() to return subshell status | Luke Diamand | 2015-11-24 | 1 | -2/+4 |
* | git-p4: add failing test for submit from detached head | Luke Diamand | 2015-11-24 | 1 | -0/+16 |
* | Release Notes: typofix | Junio C Hamano | 2015-09-09 | 1 | -1/+1 |
* | Git 2.6-rc1v2.6.0-rc1 | Junio C Hamano | 2015-09-08 | 1 | -1/+1 |
* | Merge branch 'jc/builtin-am-signoff-regression-fix' | Junio C Hamano | 2015-09-08 | 2 | -2/+77 |
|\ | |||||
| * | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fix | Junio C Hamano | 2015-09-06 | 2 | -2/+77 |
* | | Sync with maint | Junio C Hamano | 2015-09-04 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge branch 'ee/clean-test-fixes' into maint | Junio C Hamano | 2015-09-03 | 1 | -12/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/log-missing-default-HEAD' into maint | Junio C Hamano | 2015-09-03 | 2 | -1/+30 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'cc/trailers-corner-case-fix' into maint | Junio C Hamano | 2015-09-03 | 2 | -3/+39 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-03 | 3 | -5/+15 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rs/archive-zip-many' into maint | Junio C Hamano | 2015-09-03 | 2 | -5/+134 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/calloc-pathspec' into maint | Junio C Hamano | 2015-09-03 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ss/fix-config-fd-leak' into maint | Junio C Hamano | 2015-09-03 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sg/wt-status-header-inclusion' into maint | Junio C Hamano | 2015-09-03 | 2 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'po/po-readme' into maint | Junio C Hamano | 2015-09-03 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/t3020-typofix' into maint | Junio C Hamano | 2015-09-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/docfix-reflog-expire-unreachable' into maint | Junio C Hamano | 2015-09-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/fixup-linked-gitdir' into maint | Junio C Hamano | 2015-09-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-list-has-no-notes' into maint | Junio C Hamano | 2015-09-03 | 4 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fix-alias-pager-config-key-warnings' into maint | Junio C Hamano | 2015-09-03 | 5 | -12/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint | Junio C Hamano | 2015-09-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/help-group' into maint | Junio C Hamano | 2015-09-03 | 3 | -52/+52 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/t1509-chroot-test-fixup' into maint | Junio C Hamano | 2015-09-03 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/strbuf-read-use-read-in-full' into maint | Junio C Hamano | 2015-09-03 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/long-error-messages' into maint | Junio C Hamano | 2015-09-03 | 3 | -29/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/open-noatime-clear-errno' into maint | Junio C Hamano | 2015-09-03 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/get-remote-group-fix' into maint | Junio C Hamano | 2015-09-03 | 1 | -8/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/am-rerere-lock-fix' | Junio C Hamano | 2015-09-03 | 5 | -16/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fix | Jeff King | 2015-09-01 | 5 | -16/+61 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.6-rc0v2.6.0-rc0 | Junio C Hamano | 2015-09-02 | 2 | -4/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/trailers-corner-case-fix' | Junio C Hamano | 2015-09-02 | 2 | -4/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | trailer: support multiline titlecc/trailers-corner-case-fix | Christian Couder | 2015-08-31 | 2 | -4/+25 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/read-cache-one-indent-style-fix' | Junio C Hamano | 2015-09-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | read-cache: fix indentation in read_index_fromsb/read-cache-one-indent-style-fix | Stefan Beller | 2015-08-31 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ee/clean-test-fixes' | Junio C Hamano | 2015-09-02 | 1 | -12/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7300: fix broken && chainsee/clean-test-fixes | Erik Elfström | 2015-08-31 | 1 | -12/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/log-missing-default-HEAD' | Junio C Hamano | 2015-09-02 | 2 | -1/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEAD | Jeff King | 2015-08-31 | 2 | -1/+30 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Ninth batch for 2.6 | Junio C Hamano | 2015-09-01 | 1 | -0/+22 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd... | Junio C Hamano | 2015-09-01 | 3 | -5/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-update | David Turner | 2015-08-31 | 3 | -5/+15 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/remove-hold-lockfile-for-append' | Junio C Hamano | 2015-09-01 | 2 | -57/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | lockfile: remove function "hold_lock_file_for_append"rt/remove-hold-lockfile-for-append | Ralf Thielow | 2015-08-28 | 2 | -57/+7 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/archive-zip-many' | Junio C Hamano | 2015-09-01 | 2 | -5/+134 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | archive-zip: support more than 65535 entriesrs/archive-zip-many | René Scharfe | 2015-08-28 | 2 | -4/+91 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | archive-zip: use a local variable to store the creator version | René Scharfe | 2015-08-28 | 1 | -2/+4 |