Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.9.3v2.9.3 | Junio C Hamano | 2016-08-12 | 3 | -2/+13 |
* | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 2016-08-12 | 2 | -59/+41 |
|\ | |||||
| * | difftool: use Git::* functions instead of passing around state | David Aguilar | 2016-07-28 | 1 | -31/+21 |
| * | difftool: avoid $GIT_DIR and $GIT_WORK_TREE | David Aguilar | 2016-07-28 | 2 | -21/+20 |
| * | difftool: fix argument handling in subdirs | John Keeping | 2016-07-19 | 1 | -10/+3 |
* | | Merge branch 'jk/reset-ident-time-per-commit' into maint | Junio C Hamano | 2016-08-12 | 3 | -0/+8 |
|\ \ | |||||
| * | | am: reset cached ident date for each patch | Jeff King | 2016-08-01 | 3 | -0/+8 |
* | | | Yet another batch for 2.9.3 | Junio C Hamano | 2016-08-10 | 1 | -0/+68 |
* | | | Merge branch 'jh/clean-smudge-f-doc' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | clarify %f documentation | Joey Hess | 2016-08-03 | 1 | -0/+5 |
* | | | | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 | 7 | -9/+9 |
|\ \ \ \ | |||||
| * | | | | use strbuf_addstr() instead of strbuf_addf() with "%s" | René Scharfe | 2016-08-06 | 3 | -3/+3 |
| * | | | | use strbuf_addstr() for adding constant strings to a strbuf | René Scharfe | 2016-08-01 | 4 | -6/+6 |
| |/ / / | |||||
* | | | | Merge branch 'cp/completion-clone-recurse-submodules' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | completion: add option '--recurse-submodules' to 'git clone' | Chris Packham | 2016-07-27 | 1 | -0/+1 |
* | | | | | Merge branch 'jk/t4205-cleanup' into maint | Junio C Hamano | 2016-08-10 | 1 | -198/+200 |
|\ \ \ \ \ | |||||
| * | | | | | t4205: indent here documents | Jeff King | 2016-07-27 | 1 | -196/+196 |
| * | | | | | t4205: drop top-level &&-chaining | Jeff King | 2016-07-27 | 1 | -2/+4 |
* | | | | | | Merge branch 'jc/hashmap-doc-init' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | hashmap: clarify that hashmap_entry can safely be discarded | Junio C Hamano | 2016-08-02 | 1 | -0/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/nedmalloc-gcc6-warnings' into maint | Junio C Hamano | 2016-08-10 | 1 | -9/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | nedmalloc: work around overzealous GCC 6 warning | René Scharfe | 2016-08-06 | 1 | -5/+4 |
| * | | | | | | nedmalloc: fix misleading indentation | Johannes Schindelin | 2016-08-04 | 1 | -4/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'nd/fbsd-lazy-mtime' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t7063: work around FreeBSD's lazy mtime update feature | Nguyễn Thái Ngọc Duy | 2016-08-04 | 1 | -1/+16 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ab/gitweb-link-html-escape' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: escape link body in format_ref_marker | Andreas Brauchli | 2016-08-01 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'js/t4130-rename-without-ino' into maint | Junio C Hamano | 2016-08-10 | 1 | -3/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t4130: work around Windows limitation | Johannes Sixt | 2016-08-03 | 1 | -3/+7 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/grep-commandline-vs-configuration' into maint | Junio C Hamano | 2016-08-10 | 4 | -16/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | grep: further simplify setting the pattern type | Junio C Hamano | 2016-07-25 | 4 | -16/+29 |
* | | | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint | Junio C Hamano | 2016-08-10 | 2 | -0/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff: do not reuse worktree files that need "clean" conversion | Jeff King | 2016-07-22 | 2 | -0/+18 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'pm/build-persistent-https-with-recent-go' into maint | Junio C Hamano | 2016-08-10 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | contrib/persistent-https: use Git version for build label | Parker Moore | 2016-07-22 | 1 | -1/+1 |
| * | | | | | | | contrib/persistent-https: update ldflags syntax for Go 1.7+ | Parker Moore | 2016-07-22 | 1 | -1/+3 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'da/subtree-2.9-regression' into maint | Junio C Hamano | 2016-08-10 | 2 | -8/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | subtree: fix "git subtree split --rejoin" | David Aguilar | 2016-07-26 | 2 | -0/+17 |
| * | | | | | | | t7900-subtree.sh: fix quoting and broken && chains | David Aguilar | 2016-07-26 | 1 | -8/+8 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'os/no-verify-skips-commit-msg-too' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: describe that --no-verify skips the commit-msg hook in the help text | Orgad Shaneh | 2016-07-26 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/rm-strbuf-optim' into maint | Junio C Hamano | 2016-08-10 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rm: reuse strbuf for all remove_dir_recursively() calls | René Scharfe | 2016-07-13 | 1 | -2/+3 |
* | | | | | | | | Merge branch 'jk/parse-options-concat' into maint | Junio C Hamano | 2016-08-10 | 3 | -22/+22 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | parse_options: allocate a new array when concatenating | Jeff King | 2016-07-06 | 3 | -22/+22 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ls/travis-enable-httpd-tests' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | travis-ci: enable web server tests t55xx on Linux | Lars Schneider | 2016-07-12 | 1 | -0/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ew/autoconf-pthread' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | configure.ac: stronger test for pthread linkage | Eric Wong | 2016-07-18 | 1 | -0/+5 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rs/help-c-source-with-gitattributes' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ |