Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | symbolic-ref -d: do not allow removal of HEADjc/forbid-symbolic-ref-d-HEAD | Junio C Hamano | 2016-09-02 | 1 | -7/+14 |
* | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 2016-08-12 | 1 | -0/+14 |
|\ | |||||
| * | difftool: avoid $GIT_DIR and $GIT_WORK_TREE | David Aguilar | 2016-07-28 | 1 | -0/+14 |
* | | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 | 1 | -3/+3 |
|\ \ | |||||
| * | | use strbuf_addstr() for adding constant strings to a strbuf | René Scharfe | 2016-08-01 | 1 | -3/+3 |
* | | | Merge branch 'jk/t4205-cleanup' into maint | Junio C Hamano | 2016-08-10 | 1 | -198/+200 |
|\ \ \ | |||||
| * | | | t4205: indent here documentsjk/t4205-cleanup | Jeff King | 2016-07-27 | 1 | -196/+196 |
| * | | | t4205: drop top-level &&-chaining | Jeff King | 2016-07-27 | 1 | -2/+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 featurend/fbsd-lazy-mtime | Nguyễn Thái Ngọc Duy | 2016-08-04 | 1 | -1/+16 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'js/t4130-rename-without-ino' into maint | Junio C Hamano | 2016-08-10 | 1 | -3/+7 |
|\ \ \ \ | |||||
| * | | | | t4130: work around Windows limitationjs/t4130-rename-without-ino | Johannes Sixt | 2016-08-03 | 1 | -3/+7 |
* | | | | | Merge branch 'jc/grep-commandline-vs-configuration' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | grep: further simplify setting the pattern typejc/grep-commandline-vs-configuration | Junio C Hamano | 2016-07-25 | 1 | -0/+14 |
* | | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaning | Jeff King | 2016-07-22 | 1 | -0/+11 |
* | | | | | | | Merge branch 'mm/status-suggest-merge-abort' into maint | Junio C Hamano | 2016-08-10 | 2 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abort | Matthieu Moy | 2016-07-22 | 2 | -0/+5 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/submodule-config-code-cleanup' into maint | Junio C Hamano | 2016-08-08 | 2 | -1/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule-config: passing name reference for .gitmodule blobs | Heiko Voigt | 2016-07-28 | 1 | -0/+11 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-08-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/test-lib.sh: fix running tests with --valgrind | Johannes Schindelin | 2016-07-11 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ah/unpack-trees-advice-messages' into maint | Junio C Hamano | 2016-08-08 | 3 | -7/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messages | Alex Henrie | 2016-06-27 | 3 | -7/+7 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 | 1 | -4/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limit | Nguyễn Thái Ngọc Duy | 2016-07-13 | 1 | -4/+3 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 1 | -1/+1 |
| * | | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 1 | -0/+8 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/push-scrub-url' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5541: fix url scrubbing test when GPG is not setjk/push-scrub-url | Jeff King | 2016-07-20 | 1 | -2/+4 |
| * | | | | | | | | push: anonymize URL in status output | Jeff King | 2016-07-14 | 1 | -0/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'nd/cache-tree-ita' into maint | Junio C Hamano | 2016-08-08 | 14 | -50/+76 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesnd/cache-tree-ita | Nguyễn Thái Ngọc Duy | 2016-07-18 | 1 | -0/+14 |
| * | | | | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimes | Nguyễn Thái Ngọc Duy | 2016-07-18 | 1 | -0/+17 |
| * | | | | | | | | test-lib.sh: introduce and use $EMPTY_BLOB | Nguyễn Thái Ngọc Duy | 2016-07-18 | 8 | -38/+35 |
| * | | | | | | | | test-lib.sh: introduce and use $EMPTY_TREE | Nguyễn Thái Ngọc Duy | 2016-07-18 | 6 | -13/+11 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mh/blame-worktree' into maint | Junio C Hamano | 2016-08-08 | 1 | -17/+62 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | t/t8003-blame-corner-cases.sh: Use here documents | Mike Hommey | 2016-07-18 | 1 | -17/+17 |
| * | | | | | | | blame: allow to blame paths freshly added to the index | Mike Hommey | 2016-07-18 | 1 | -0/+45 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'da/difftool' into maint | Junio C Hamano | 2016-06-06 | 1 | -0/+23 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'tb/core-eol-fix' into maint | Junio C Hamano | 2016-06-06 | 1 | -170/+131 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ar/diff-args-osx-precompose' into maint | Junio C Hamano | 2016-06-06 | 1 | -0/+42 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t7610: test for mktemp before test execution | Armin Kunaschik | 2016-07-06 | 1 | -1/+6 |
* | | | | | | | | | | | Merge branch 'nd/icase' into maint | Junio C Hamano | 2016-07-28 | 4 | -3/+148 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | diffcore-pickaxe: support case insensitive match on non-ascii | Nguyễn Thái Ngọc Duy | 2016-07-01 | 1 | -0/+7 |
| * | | | | | | | | | | | grep/pcre: support utf-8 | Nguyễn Thái Ngọc Duy | 2016-07-01 | 1 | -0/+15 |
| * | | | | | | | | | | | grep/pcre: prepare locale-dependent tables for icase matching | Nguyễn Thái Ngọc Duy | 2016-07-01 | 1 | -0/+19 |
| * | | | | | | | | | | | grep/icase: avoid kwsset when -F is specified | Nguyễn Thái Ngọc Duy | 2016-07-01 | 1 | -0/+26 |