summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* blame: handle --first-parentjk/blame-first-parentJeff King2015-09-162-1/+14
* Git 2.5.2v2.5.2Junio C Hamano2015-09-044-3/+67
* Sync with 2.4.9Junio C Hamano2015-09-048-27/+60
|\
| * Git 2.4.9v2.4.9Junio C Hamano2015-09-044-3/+13
| * Sync with 2.3.9Junio C Hamano2015-09-047-26/+49
| |\
| | * Git 2.3.9v2.3.9Junio C Hamano2015-09-044-3/+13
| | * Sync with 2.2.3Junio C Hamano2015-09-046-25/+38
| | |\
| | | * Git 2.2.3v2.2.3maint-2.2Junio C Hamano2015-09-044-3/+13
| | | * Merge branch 'jk/long-paths' into maint-2.2Junio C Hamano2015-09-044-24/+27
| | | |\
| | | | * show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
| | | | * read_info_alternates: handle paths larger than PATH_MAXJeff King2015-09-041-6/+3
| | | | * notes: use a strbuf in add_non_noteJeff King2015-09-041-9/+10
| | | | * verify_absent: allow filenames longer than PATH_MAXJeff King2015-09-041-7/+10
| | | |/
* | | | Merge branch 'ee/clean-test-fixes' into maintJunio C Hamano2015-09-031-12/+4
|\ \ \ \
| * | | | t7300: fix broken && chainsee/clean-test-fixesErik Elfström2015-08-311-12/+4
* | | | | Merge branch 'jk/log-missing-default-HEAD' into maintJunio C Hamano2015-09-032-1/+30
|\ \ \ \ \
| * | | | | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEADJeff King2015-08-312-1/+30
* | | | | | Merge branch 'cc/trailers-corner-case-fix' into maintJunio C Hamano2015-09-032-3/+39
|\ \ \ \ \ \
| * | | | | | trailer: support multiline titlecc/trailers-corner-case-fixChristian Couder2015-08-312-4/+25
| * | | | | | trailer: retitle a test and correct an in-comment messageChristian Couder2015-08-262-2/+3
| * | | | | | trailer: ignore first line of messageChristian Couder2015-08-212-2/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-033-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 'rs/archive-zip-many' into maintJunio C Hamano2015-09-032-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
| * | | | | | | t5004: test ZIP archives with many entriesRené Scharfe2015-08-281-0/+40
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2015-09-032-2/+2
|\ \ \ \ \ \ \
| * | | | | | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspecJunio C Hamano2015-08-202-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'ss/fix-config-fd-leak' into maintJunio C Hamano2015-09-031-1/+4
|\ \ \ \ \ \ \
| * | | | | | | config: close config file handle in case of errorss/fix-config-fd-leakSven Strickroth2015-08-141-1/+4
* | | | | | | | Merge branch 'sg/wt-status-header-inclusion' into maintJunio C Hamano2015-09-032-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | wt-status: move #include "pathspec.h" to the headersg/wt-status-header-inclusionSZEDER Gábor2015-08-212-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'po/po-readme' into maintJunio C Hamano2015-09-031-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | po/README: Update directions for l10n contributorspo/po-readmePhilip Oakley2015-08-171-0/+19
* | | | | | | | | Merge branch 'sg/t3020-typofix' into maintJunio C Hamano2015-09-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t3020: fix typo in test descriptionsg/t3020-typofixSZEDER Gábor2015-08-201-1/+1
* | | | | | | | | | Merge branch 'as/docfix-reflog-expire-unreachable' into maintJunio C Hamano2015-09-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableas/docfix-reflog-expire-unreachableAndreas Schwab2015-08-211-1/+1
* | | | | | | | | | | Merge branch 'nd/fixup-linked-gitdir' into maintJunio C Hamano2015-09-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | setup: update the right file in multiple checkoutsnd/fixup-linked-gitdirNguyễn Thái Ngọc Duy2015-08-251-2/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/rev-list-has-no-notes' into maintJunio C Hamano2015-09-034-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notesJeff King2015-08-244-0/+9
* | | | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings' into maintJunio C Hamano2015-09-035-12/+43
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warningsJeff King2015-08-245-12/+43
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2015-09-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t2019: skip test requiring '*' in a file name non WindowsJohannes Sixt2015-08-111-1/+1
* | | | | | | | | | | | | Merge branch 'sg/help-group' into maintJunio C Hamano2015-09-033-52/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | generate-cmdlist: re-implement as shell scriptEric Sunshine2015-08-253-52/+52
* | | | | | | | | | | | | | Merge branch 'ps/t1509-chroot-test-fixup' into maintJunio C Hamano2015-09-031-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \