summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* DONTMERGE git-p4: "name-rev HEAD" is not a way to find the current branchjc/p4-current-branch-fixJunio C Hamano2017-03-272-2/+2
* git-p4: add failing test for name-rev rather than symbolic-refLuke Diamand2017-03-261-0/+16
* git-p4: work with a detached headld/p4-detached-headLuke Diamand2015-11-242-8/+17
* git-p4: add option to system() to return subshell statusLuke Diamand2015-11-241-2/+4
* git-p4: add failing test for submit from detached headLuke Diamand2015-11-241-0/+16
* Release Notes: typofixJunio C Hamano2015-09-091-1/+1
* Git 2.6-rc1v2.6.0-rc1Junio C Hamano2015-09-081-1/+1
* Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-082-2/+77
|\
| * am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-062-2/+77
* | Sync with maintJunio C Hamano2015-09-040-0/+0
|\ \
| * \ Merge branch 'ee/clean-test-fixes' into maintJunio C Hamano2015-09-031-12/+4
| |\ \
| * \ \ Merge branch 'jk/log-missing-default-HEAD' into maintJunio C Hamano2015-09-032-1/+30
| |\ \ \
| * \ \ \ Merge branch 'cc/trailers-corner-case-fix' into maintJunio C Hamano2015-09-032-3/+39
| |\ \ \ \
| * \ \ \ \ Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-033-5/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/archive-zip-many' into maintJunio C Hamano2015-09-032-5/+134
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2015-09-032-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ss/fix-config-fd-leak' into maintJunio C Hamano2015-09-031-1/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sg/wt-status-header-inclusion' into maintJunio C Hamano2015-09-032-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'po/po-readme' into maintJunio C Hamano2015-09-031-0/+19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/t3020-typofix' into maintJunio C Hamano2015-09-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/docfix-reflog-expire-unreachable' into maintJunio C Hamano2015-09-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/fixup-linked-gitdir' into maintJunio C Hamano2015-09-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-has-no-notes' into maintJunio C Hamano2015-09-034-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-alias-pager-config-key-warnings' into maintJunio C Hamano2015-09-035-12/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2015-09-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/help-group' into maintJunio C Hamano2015-09-033-52/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/t1509-chroot-test-fixup' into maintJunio C Hamano2015-09-031-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/strbuf-read-use-read-in-full' into maintJunio C Hamano2015-09-031-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/long-error-messages' into maintJunio C Hamano2015-09-033-29/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/open-noatime-clear-errno' into maintJunio C Hamano2015-09-031-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/get-remote-group-fix' into maintJunio C Hamano2015-09-031-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/am-rerere-lock-fix'Junio C Hamano2015-09-035-16/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-015-16/+61
* | | | | | | | | | | | | | | | | | | | | | | | | Git 2.6-rc0v2.6.0-rc0Junio C Hamano2015-09-022-4/+13
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-09-022-4/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | trailer: support multiline titlecc/trailers-corner-case-fixChristian Couder2015-08-312-4/+25
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/read-cache-one-indent-style-fix'Junio C Hamano2015-09-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | read-cache: fix indentation in read_index_fromsb/read-cache-one-indent-style-fixStefan Beller2015-08-311-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ee/clean-test-fixes'Junio C Hamano2015-09-021-12/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t7300: fix broken && chainsee/clean-test-fixesErik Elfström2015-08-311-12/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/log-missing-default-HEAD'Junio C Hamano2015-09-022-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEADJeff King2015-08-312-1/+30
* | | | | | | | | | | | | | | | | | | | | | | | | | Ninth batch for 2.6Junio C Hamano2015-09-011-0/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-013-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-313-5/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/remove-hold-lockfile-for-append'Junio C Hamano2015-09-012-57/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | lockfile: remove function "hold_lock_file_for_append"rt/remove-hold-lockfile-for-appendRalf Thielow2015-08-282-57/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/archive-zip-many'Junio C Hamano2015-09-012-5/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | archive-zip: support more than 65535 entriesrs/archive-zip-manyRené Scharfe2015-08-282-4/+91
| * | | | | | | | | | | | | | | | | | | | | | | | | | archive-zip: use a local variable to store the creator versionRené Scharfe2015-08-281-2/+4