Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 2016-08-12 |
|\ | |||
| * | difftool: avoid $GIT_DIR and $GIT_WORK_TREE | David Aguilar | 2016-07-28 |
* | | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 |
|\ \ | |||
| * | | use strbuf_addstr() for adding constant strings to a strbuf | René Scharfe | 2016-08-01 |
* | | | Merge branch 'jk/t4205-cleanup' into maint | Junio C Hamano | 2016-08-10 |
|\ \ \ | |||
| * | | | t4205: indent here documents | Jeff King | 2016-07-27 |
| * | | | t4205: drop top-level &&-chaining | Jeff King | 2016-07-27 |
* | | | | Merge branch 'nd/fbsd-lazy-mtime' into maint | Junio C Hamano | 2016-08-10 |
|\ \ \ \ | |||
| * | | | | t7063: work around FreeBSD's lazy mtime update feature | Nguyễn Thái Ngọc Duy | 2016-08-04 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'js/t4130-rename-without-ino' into maint | Junio C Hamano | 2016-08-10 |
|\ \ \ \ | |||
| * | | | | t4130: work around Windows limitation | Johannes Sixt | 2016-08-03 |
* | | | | | Merge branch 'jc/grep-commandline-vs-configuration' into maint | Junio C Hamano | 2016-08-10 |
|\ \ \ \ \ | |||
| * | | | | | grep: further simplify setting the pattern type | Junio C Hamano | 2016-07-25 |
* | | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint | Junio C Hamano | 2016-08-10 |
|\ \ \ \ \ \ | |||
| * | | | | | | diff: do not reuse worktree files that need "clean" conversion | Jeff King | 2016-07-22 |
* | | | | | | | Merge branch 'mm/status-suggest-merge-abort' into maint | Junio C Hamano | 2016-08-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | status: suggest 'git merge --abort' when appropriate | Matthieu Moy | 2016-07-22 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'rs/submodule-config-code-cleanup' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | submodule-config: passing name reference for .gitmodule blobs | Heiko Voigt | 2016-07-28 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t/test-lib.sh: fix running tests with --valgrind | Johannes Schindelin | 2016-07-11 |
* | | | | | | | | Merge branch 'ah/unpack-trees-advice-messages' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | unpack-trees: fix English grammar in do-this-before-that messages | Alex Henrie | 2016-06-27 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||
* | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | fsck: use streaming interface for large blobs in pack | Nguyễn Thái Ngọc Duy | 2016-07-13 |
| | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 |
| * | | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/push-scrub-url' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t5541: fix url scrubbing test when GPG is not set | Jeff King | 2016-07-20 |
| * | | | | | | | | push: anonymize URL in status output | Jeff King | 2016-07-14 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'nd/cache-tree-ita' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentries | Nguyễn Thái Ngọc Duy | 2016-07-18 |
| * | | | | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimes | Nguyễn Thái Ngọc Duy | 2016-07-18 |
| * | | | | | | | | test-lib.sh: introduce and use $EMPTY_BLOB | Nguyễn Thái Ngọc Duy | 2016-07-18 |
| * | | | | | | | | test-lib.sh: introduce and use $EMPTY_TREE | Nguyễn Thái Ngọc Duy | 2016-07-18 |
| | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'mh/blame-worktree' into maint | Junio C Hamano | 2016-08-08 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| * | | | | | | | t/t8003-blame-corner-cases.sh: Use here documents | Mike Hommey | 2016-07-18 |
| * | | | | | | | blame: allow to blame paths freshly added to the index | Mike Hommey | 2016-07-18 |
| | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge branch 'da/difftool' into maint | Junio C Hamano | 2016-06-06 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'tb/core-eol-fix' into maint | Junio C Hamano | 2016-06-06 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'ar/diff-args-osx-precompose' into maint | Junio C Hamano | 2016-06-06 |
| |\ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2016-07-28 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t7610: test for mktemp before test execution | Armin Kunaschik | 2016-07-06 |
* | | | | | | | | | | | Merge branch 'nd/icase' into maint | Junio C Hamano | 2016-07-28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | diffcore-pickaxe: support case insensitive match on non-ascii | Nguyễn Thái Ngọc Duy | 2016-07-01 |
| * | | | | | | | | | | | grep/pcre: support utf-8 | Nguyễn Thái Ngọc Duy | 2016-07-01 |
| * | | | | | | | | | | | grep/pcre: prepare locale-dependent tables for icase matching | Nguyễn Thái Ngọc Duy | 2016-07-01 |
| * | | | | | | | | | | | grep/icase: avoid kwsset when -F is specified | Nguyễn Thái Ngọc Duy | 2016-07-01 |
| * | | | | | | | | | | | grep/icase: avoid kwsset on literal non-ascii strings | Nguyễn Thái Ngọc Duy | 2016-06-27 |