Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'js/t6026-clean-up' into maint | Junio C Hamano | 2016-09-19 |
|\ | |||
| * | t6026-merge-attr: clean up background process at end of test case | Johannes Sixt | 2016-09-07 |
* | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint | Junio C Hamano | 2016-09-19 |
|\ \ | |||
| * | | symbolic-ref -d: do not allow removal of HEAD | Junio C Hamano | 2016-09-02 |
* | | | Merge branch 'jc/submodule-anchor-git-dir' into maint | Junio C Hamano | 2016-09-19 |
|\ \ \ | |||
| * | | | submodule: avoid auto-discovery in prepare_submodule_repo_env() | Junio C Hamano | 2016-09-01 |
| |/ / | |||
* | | | Merge branch 'jk/test-lib-drop-pid-from-results' into maint | Junio C Hamano | 2016-09-19 |
|\ \ \ | |_|/ |/| | | |||
| * | | test-lib: drop PID from test-results/*.count | Jeff King | 2016-08-30 |
| |/ | |||
* | | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-08-31 |
|\ \ | |||
| * | | blame: fix segfault on untracked files | Thomas Gummerer | 2016-08-29 |
* | | | Merge branch 'kw/patch-ids-optim' | Junio C Hamano | 2016-08-31 |
|\ \ \ | |||
| * | | | p3400: make test script executable | René Scharfe | 2016-08-29 |
* | | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' | Junio C Hamano | 2016-08-25 |
|\ \ \ \ | |||
| * | | | | mingw: ensure temporary file handles are not inherited by child processes | Ben Wijen | 2016-08-23 |
| * | | | | t6026-merge-attr: child processes must not inherit index.lock handles | Ben Wijen | 2016-08-18 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'ab/hooks' | Junio C Hamano | 2016-08-19 |
|\ \ \ \ | |||
| * | | | | rev-parse: respect core.hooksPath in --git-path | Johannes Schindelin | 2016-08-16 |
* | | | | | Merge branch 'jk/difftool-command-not-found' | Junio C Hamano | 2016-08-19 |
|\ \ \ \ \ | |||
| * | | | | | difftool: always honor fatal error exit codes | John Keeping | 2016-08-15 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'sb/checkout-explit-detach-no-advice' | Junio C Hamano | 2016-08-19 |
|\ \ \ \ \ | |||
| * | | | | | checkout: do not mention detach advice for explicit --detach option | Stefan Beller | 2016-08-15 |
| |/ / / / | |||
* | | | | | Merge branch 'tb/t0027-raciness-fix' | Junio C Hamano | 2016-08-19 |
|\ \ \ \ \ | |||
| * | | | | | convert: Correct NNO tests and missing `LF will be replaced by CRLF` | Torsten Bögershausen | 2016-08-14 |
* | | | | | | Merge branch 'rs/pull-signed-tag' | Junio C Hamano | 2016-08-19 |
|\ \ \ \ \ \ | |||
| * | | | | | | merge-recursive: fix verbose output for multiple base trees | René Scharfe | 2016-08-13 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'js/test-lint-pathname' | Junio C Hamano | 2016-08-17 |
|\ \ \ \ \ \ | |||
| * | | | | | | t/Makefile: ensure that paths are valid on platforms we care | Johannes Schindelin | 2016-08-16 |
| |/ / / / / | |||
| * | | | | | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 2016-08-12 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/t4205-cleanup' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'nd/fbsd-lazy-mtime' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/t4130-rename-without-ino' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/grep-commandline-vs-configuration' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/status-suggest-merge-abort' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/submodule-config-code-cleanup' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/unpack-trees-advice-messages' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-scrub-url' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/cache-tree-ita' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/blame-worktree' into maint | Junio C Hamano | 2016-08-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/reflog-past-root' | Junio C Hamano | 2016-08-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | t1410: remove superfluous 'git reflog' from the 'walk past root' test | SZEDER Gábor | 2016-08-15 |
* | | | | | | | | | | | | | | | | | | | | | | t7411: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-08-12 |
* | | | | | | | | | | | | | | | | | | | | | | t5520: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-08-12 |
* | | | | | | | | | | | | | | | | | | | | | | t3404: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-08-12 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/patch-ids-optim' | Junio C Hamano | 2016-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | | | rebase: avoid computing unnecessary patch IDs | Kevin Willford | 2016-08-11 |