| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge tag 'v2.8.6' into maint-2.9 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 |
|\ |
|
| * | Merge tag 'v2.7.6' into maint-2.8 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 |
| |\ |
|
| | * | connect: reject paths that look like command line options | Jeff King | 2017-07-28 | 2 | -0/+37 |
| | * | connect: reject dashed arguments for proxy commands | Jeff King | 2017-07-28 | 1 | -0/+5 |
| | * | t5813: add test for hostname starting with dash | Jeff King | 2017-07-28 | 1 | -0/+9 |
* | | | Merge branch 'sg/reflog-past-root' into maint | Junio C Hamano | 2016-09-08 | 1 | -1/+0 |
|\ \ \ |
|
| * | | | t1410: remove superfluous 'git reflog' from the 'walk past root' testsg/reflog-past-root | SZEDER Gábor | 2016-08-15 | 1 | -1/+0 |
* | | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+13 |
|\ \ \ \ |
|
| * | | | | mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfile | Ben Wijen | 2016-08-23 | 1 | -1/+1 |
| * | | | | t6026-merge-attr: child processes must not inherit index.lock handles | Ben Wijen | 2016-08-18 | 1 | -0/+13 |
* | | | | | Merge branch 'jk/difftool-command-not-found' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+6 |
|\ \ \ \ \ |
|
| * | | | | | difftool: always honor fatal error exit codesjk/difftool-command-not-found | John Keeping | 2016-08-15 | 1 | -0/+6 |
| |/ / / / |
|
* | | | | | Merge branch 'sb/checkout-explit-detach-no-advice' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+23 |
|\ \ \ \ \ |
|
| * | | | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-advice | Stefan Beller | 2016-08-15 | 1 | -0/+23 |
| |/ / / / |
|
* | | | | | Merge branch 'rs/pull-signed-tag' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+18 |
|\ \ \ \ \ |
|
| * | | | | | merge-recursive: fix verbose output for multiple base trees | René Scharfe | 2016-08-13 | 1 | -0/+18 |
| |/ / / / |
|
* | | | | | Merge branch 'js/test-lint-pathname' into maint | Junio C Hamano | 2016-09-08 | 1 | -1/+10 |
|\ \ \ \ \ |
|
| * | | | | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathname | Johannes Schindelin | 2016-08-16 | 1 | -1/+10 |
| |/ / / / |
|
* | | | | | Merge branch 'jk/push-force-with-lease-creation' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+38 |
|\ \ \ \ \ |
|
| * | | | | | t5533: make it pass on case-sensitive filesystemsjk/push-force-with-lease-creation | Johannes Schindelin | 2016-08-04 | 1 | -1/+1 |
| * | | | | | push: allow pushing new branches with --force-with-lease | John Keeping | 2016-07-26 | 1 | -0/+12 |
| * | | | | | push: add shorthand for --force-with-lease branch creation | John Keeping | 2016-07-26 | 1 | -0/+26 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'jk/reflog-date' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+3 |
|\ \ \ \ \ |
|
| * | | | | | date: add "unix" format | Jeff King | 2016-07-27 | 1 | -0/+2 |
| * | | | | | date: document and test "raw-local" mode | Jeff King | 2016-07-27 | 1 | -0/+1 |
* | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2016-09-08 | 3 | -48/+59 |
|\ \ \ \ \ \ |
|
| * | | | | | | merge: avoid "safer crlf" during recording of merge results | Junio C Hamano | 2016-07-12 | 1 | -23/+28 |
| * | | | | | | convert: unify the "auto" handling of CRLF | Torsten Bögershausen | 2016-07-06 | 3 | -25/+31 |
* | | | | | | | Merge branch 'jk/common-main' into maint | Junio C Hamano | 2016-09-08 | 33 | -43/+43 |
|\ \ \ \ \ \ \
| |_|_|_|/ / /
|/| | | | | | |
|
| * | | | | | | Merge branch 'jk/common-main-2.8' into jk/common-main | Junio C Hamano | 2016-07-06 | 33 | -40/+40 |
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
* | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ |
|