summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: explain optional arguments bettermm/keyid-docsMatthieu Moy2015-09-219-10/+28
* Documentation/grep: fix documentation of -OMatthieu Moy2015-09-211-2/+2
* Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy2015-09-215-17/+17
* Git 2.5.3v2.5.3Junio C Hamano2015-09-174-3/+21
* Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2015-09-172-32/+282
|\
| * untracked cache: fix entry invalidationdt/untracked-subdirNguyễn Thái Ngọc Duy2015-08-192-13/+83
| * untracked-cache: fix subdirectory handlingDavid Turner2015-08-192-7/+79
| * t7063: use --force-untracked-cache to speed up a bitdt/untracked-sparseNguyễn Thái Ngọc Duy2015-08-191-1/+1
| * untracked-cache: support sparse checkoutDavid Turner2015-07-312-14/+122
* | Merge branch 'br/svn-doc-include-paths-config' into maintJunio C Hamano2015-09-171-0/+3
|\ \
| * | git-svn doc: mention "svn-remote.<name>.include-paths"br/svn-doc-include-paths-configBrett Randall2015-08-261-0/+3
* | | Merge branch 'ah/submodule-typofix-in-error' into maintJunio C Hamano2015-09-171-1/+1
|\ \ \
| * | | git-submodule: remove extraneous space from error messageah/submodule-typofix-in-errorAlex Henrie2015-08-281-1/+1
* | | | Merge branch 'js/maint-am-skip-performance-regression' into maintJunio C Hamano2015-09-171-1/+1
|\ \ \ \
| * | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexjs/maint-am-skip-performance-regressionJohannes Schindelin2015-09-091-1/+1
* | | | | 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
|\ \ \ \ \ \ \ \ \ \ \