summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* xdiff: remove unneeded declarationssb/xdiff-remove-unused-static-declStefan Beller2016-09-071-9/+0
* Git 2.9.3v2.9.3Junio C Hamano2016-08-123-2/+13
* Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-122-59/+41
|\
| * difftool: use Git::* functions instead of passing around stateDavid Aguilar2016-07-281-31/+21
| * difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar2016-07-282-21/+20
| * difftool: fix argument handling in subdirsJohn Keeping2016-07-191-10/+3
* | Merge branch 'jk/reset-ident-time-per-commit' into maintJunio C Hamano2016-08-123-0/+8
|\ \
| * | am: reset cached ident date for each patchjk/reset-ident-time-per-commitJeff King2016-08-013-0/+8
* | | Yet another batch for 2.9.3Junio C Hamano2016-08-101-0/+68
* | | Merge branch 'jh/clean-smudge-f-doc' into maintJunio C Hamano2016-08-101-0/+5
|\ \ \
| * | | clarify %f documentationjh/clean-smudge-f-docJoey Hess2016-08-031-0/+5
* | | | Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-107-9/+9
|\ \ \ \
| * | | | use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstrRené Scharfe2016-08-053-3/+3
| * | | | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-014-6/+6
| |/ / /
* | | | Merge branch 'cp/completion-clone-recurse-submodules' into maintJunio C Hamano2016-08-101-0/+1
|\ \ \ \
| * | | | completion: add option '--recurse-submodules' to 'git clone'cp/completion-clone-recurse-submodulesChris Packham2016-07-271-0/+1
* | | | | Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano2016-08-101-198/+200
|\ \ \ \ \
| * | | | | t4205: indent here documentsjk/t4205-cleanupJeff King2016-07-271-196/+196
| * | | | | t4205: drop top-level &&-chainingJeff King2016-07-271-2/+4
* | | | | | Merge branch 'jc/hashmap-doc-init' into maintJunio C Hamano2016-08-101-0/+5
|\ \ \ \ \ \
| * | | | | | hashmap: clarify that hashmap_entry can safely be discardedjc/hashmap-doc-initJunio C Hamano2016-08-021-0/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/nedmalloc-gcc6-warnings' into maintJunio C Hamano2016-08-101-9/+8
|\ \ \ \ \ \
| * | | | | | nedmalloc: work around overzealous GCC 6 warningjs/nedmalloc-gcc6-warningsRené Scharfe2016-08-051-5/+4
| * | | | | | nedmalloc: fix misleading indentationJohannes Schindelin2016-08-041-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nd/fbsd-lazy-mtime' into maintJunio C Hamano2016-08-101-1/+16
|\ \ \ \ \ \
| * | | | | | t7063: work around FreeBSD's lazy mtime update featurend/fbsd-lazy-mtimeNguyễn Thái Ngọc Duy2016-08-041-1/+16
| |/ / / / /
* | | | | | Merge branch 'ab/gitweb-link-html-escape' into maintJunio C Hamano2016-08-101-1/+1
|\ \ \ \ \ \
| * | | | | | gitweb: escape link body in format_ref_markerab/gitweb-link-html-escapeAndreas Brauchli2016-08-011-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'js/t4130-rename-without-ino' into maintJunio C Hamano2016-08-101-3/+7
|\ \ \ \ \ \
| * | | | | | t4130: work around Windows limitationjs/t4130-rename-without-inoJohannes Sixt2016-08-031-3/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jc/grep-commandline-vs-configuration' into maintJunio C Hamano2016-08-104-16/+29
|\ \ \ \ \ \
| * | | | | | grep: further simplify setting the pattern typejc/grep-commandline-vs-configurationJunio C Hamano2016-07-254-16/+29
* | | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-102-0/+18
|\ \ \ \ \ \ \
| * | | | | | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaningJeff King2016-07-222-0/+18
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'pm/build-persistent-https-with-recent-go' into maintJunio C Hamano2016-08-101-2/+4
|\ \ \ \ \ \ \
| * | | | | | | contrib/persistent-https: use Git version for build labelpm/build-persistent-https-with-recent-goParker Moore2016-07-221-1/+1
| * | | | | | | contrib/persistent-https: update ldflags syntax for Go 1.7+Parker Moore2016-07-221-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'da/subtree-2.9-regression' into maintJunio C Hamano2016-08-102-8/+25
|\ \ \ \ \ \ \
| * | | | | | | subtree: fix "git subtree split --rejoin"da/subtree-2.9-regressionDavid Aguilar2016-07-262-0/+17
| * | | | | | | t7900-subtree.sh: fix quoting and broken && chainsDavid Aguilar2016-07-261-8/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'os/no-verify-skips-commit-msg-too' into maintJunio C Hamano2016-08-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | commit: describe that --no-verify skips the commit-msg hook in the help textos/no-verify-skips-commit-msg-tooOrgad Shaneh2016-07-261-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rs/rm-strbuf-optim' into maintJunio C Hamano2016-08-101-2/+3
|\ \ \ \ \ \ \
| * | | | | | | rm: reuse strbuf for all remove_dir_recursively() callsrs/rm-strbuf-optimRené Scharfe2016-07-121-2/+3
* | | | | | | | Merge branch 'jk/parse-options-concat' into maintJunio C Hamano2016-08-103-22/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | parse_options: allocate a new array when concatenatingjk/parse-options-concatJeff King2016-07-063-22/+22
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ls/travis-enable-httpd-tests' into maintJunio C Hamano2016-08-101-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | travis-ci: enable web server tests t55xx on Linuxls/travis-enable-httpd-testsLars Schneider2016-07-121-0/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'ew/autoconf-pthread' into maintJunio C Hamano2016-08-101-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | configure.ac: stronger test for pthread linkageew/autoconf-pthreadEric Wong2016-07-181-0/+5
| | |_|/ / / / / | |/| | | | | |