Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jh/object-filtering' | Junio C Hamano | 2018-01-11 |
|\ | |||
| * | oidset: don't return value from oidset_init | Thomas Gummerer | 2018-01-08 |
* | | Merge branch 'tg/worktree-create-tracking' | Junio C Hamano | 2018-01-11 |
|\ \ | |||
| * | | Documentation/git-worktree.txt: add missing ` | Ralf Thielow | 2018-01-11 |
* | | | Merge branch 'js/test-with-ws-in-path' | Junio C Hamano | 2018-01-11 |
|\ \ \ | |||
| * | | | t3900: add some more quotes | Beat Bolli | 2018-01-10 |
* | | | | RelNotes update before -rc2 | Junio C Hamano | 2018-01-10 |
* | | | | Merge branch 'js/perl-path-workaround-in-tests' | Junio C Hamano | 2018-01-10 |
|\ \ \ \ | |||
| * | | | | mingw: handle GITPERLLIB in t0021 in a Windows-compatible way | Johannes Schindelin | 2018-01-10 |
* | | | | | Merge branch 'ew/empty-merge-with-dirty-index' | Junio C Hamano | 2018-01-10 |
|\ \ \ \ \ | |||
| * \ \ \ \ | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... | Junio C Hamano | 2018-01-09 |
| |\ \ \ \ \ | |||
| | * | | | | | merge-recursive: do not look at the index during recursive merge | Junio C Hamano | 2018-01-09 |
* | | | | | | | Merge branch 'ma/bisect-leakfix' | Junio C Hamano | 2018-01-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | bisect: fix a regression causing a segfault | Ævar Arnfjörð Bjarmason | 2018-01-03 |
* | | | | | | | | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' | Junio C Hamano | 2018-01-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | rebase -p: fix quoting when calling `git merge` | Johannes Schindelin | 2018-01-05 |
* | | | | | | | | | Merge branch 'jk/doc-diff-options' | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | docs/diff-options: clarify scope of diff-filter types | Jeff King | 2018-01-04 |
* | | | | | | | | | | Merge branch 'bw/protocol-v1' | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | http: fix v1 protocol tests with apache httpd < 2.4 | Todd Zullinger | 2018-01-04 |
* | | | | | | | | | | | Merge branch 'sg/travis-check-untracked' | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | travis-ci: check that all build artifacts are .gitignore-d | SZEDER Gábor | 2018-01-03 |
| * | | | | | | | | | | | travis-ci: don't store P4 and Git LFS in the working tree | SZEDER Gábor | 2018-01-03 |
* | | | | | | | | | | | | Merge branch 'js/test-with-ws-in-path' | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | t0302 & t3900: add forgotten quotes | Johannes Schindelin | 2018-01-03 |
| * | | | | | | | | | | | Allow the test suite to pass in a directory whose name contains spaces | Johannes Schindelin | 2018-01-03 |
* | | | | | | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc' | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | doc/SubmittingPatches: improve text formatting | Todd Zullinger | 2018-01-03 |
* | | | | | | | | | | | | | Merge branch 'sg/travis-skip-identical-test' | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | travis-ci: record and skip successfully built trees | SZEDER Gábor | 2018-01-02 |
| * | | | | | | | | | | | | travis-ci: create the cache directory early in the build process | SZEDER Gábor | 2018-01-02 |
| * | | | | | | | | | | | | travis-ci: print the "tip of branch is exactly at tag" message in color | SZEDER Gábor | 2018-01-02 |
* | | | | | | | | | | | | | Merge branch 'ab/dc-sha1-loose-ends' | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1 | Ævar Arnfjörð Bjarmason | 2017-12-28 |
* | | | | | | | | | | | | | | Merge branch 'sg/travis-fixes' | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | travis-ci: only print test failures if there are test results available | SZEDER Gábor | 2017-12-27 |
| * | | | | | | | | | | | | | travis-ci: save prove state for the 32 bit Linux build | SZEDER Gábor | 2017-12-27 |
| * | | | | | | | | | | | | | travis-ci: don't install default addon packages for the 32 bit Linux build | SZEDER Gábor | 2017-12-27 |
| * | | | | | | | | | | | | | travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts | SZEDER Gábor | 2017-12-27 |
* | | | | | | | | | | | | | | Merge branch 'js/misc-git-gui-stuff' of ../git-gui | Junio C Hamano | 2018-01-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | git-gui: allow Ctrl+T to toggle multiple paths | Johannes Schindelin | 2018-01-09 |
| * | | | | | | | | | | | | | git-gui: fix exception when trying to stage with empty file list | Johannes Schindelin | 2018-01-09 |
| * | | | | | | | | | | | | | git-gui: avoid exception upon Ctrl+T in an empty list | Johannes Schindelin | 2018-01-09 |
| * | | | | | | | | | | | | | git gui: fix staging a second line to a 1-line file | Johannes Schindelin | 2018-01-09 |
* | | | | | | | | | | | | | | Git 2.16-rc1 | Junio C Hamano | 2018-01-05 |
* | | | | | | | | | | | | | | Merge branch 'js/sequencer-cleanups' | Junio C Hamano | 2018-01-05 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | sequencer: do not invent whitespace when transforming OIDs | Johannes Schindelin | 2017-12-27 |
| * | | | | | | | | | | | | | | sequencer: report when noop has an argument | Johannes Schindelin | 2017-12-27 |
| * | | | | | | | | | | | | | | sequencer: remove superfluous conditional | Johannes Schindelin | 2017-12-27 |
| * | | | | | | | | | | | | | | sequencer: strip bogus LF at end of error messages | Johannes Schindelin | 2017-12-27 |