Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dir.c: report errors from remove_dir_recurse()jc/remove-dir-recursively | Junio C Hamano | 2018-01-12 | 2 | -12/+57 |
* | dir.c:: use is_nonbare_repository_dir() to check for embedded repository | Junio C Hamano | 2018-01-12 | 1 | -2/+1 |
* | dir.c: use 'unsigned flags' not 'int flag' for collection of bits | Junio C Hamano | 2018-01-12 | 2 | -9/+9 |
* | RelNotes: minor typofix | SZEDER Gábor | 2018-01-12 | 1 | -1/+1 |
* | Git 2.16-rc2v2.16.0-rc2 | Junio C Hamano | 2018-01-11 | 1 | -1/+1 |
* | Merge branch 'jh/object-filtering' | Junio C Hamano | 2018-01-11 | 1 | -1/+1 |
|\ | |||||
| * | oidset: don't return value from oidset_initjh/object-filtering | Thomas Gummerer | 2018-01-08 | 1 | -1/+1 |
* | | Merge branch 'tg/worktree-create-tracking' | Junio C Hamano | 2018-01-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | Documentation/git-worktree.txt: add missing ` | Ralf Thielow | 2018-01-11 | 1 | -1/+1 |
* | | | Merge branch 'js/test-with-ws-in-path' | Junio C Hamano | 2018-01-11 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | t3900: add some more quotesjs/test-with-ws-in-path | Beat Bolli | 2018-01-10 | 1 | -4/+4 |
* | | | | RelNotes update before -rc2 | Junio C Hamano | 2018-01-10 | 1 | -0/+10 |
* | | | | Merge branch 'js/perl-path-workaround-in-tests' | Junio C Hamano | 2018-01-10 | 1 | -1/+16 |
|\ \ \ \ | |||||
| * | | | | mingw: handle GITPERLLIB in t0021 in a Windows-compatible wayjs/perl-path-workaround-in-tests | Johannes Schindelin | 2018-01-10 | 1 | -1/+16 |
* | | | | | Merge branch 'ew/empty-merge-with-dirty-index' | Junio C Hamano | 2018-01-10 | 2 | -1/+51 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...ew/empty-merge-with-dirty-index | Junio C Hamano | 2018-01-09 | 2 | -1/+51 |
| |\ \ \ \ \ | |||||
| | * | | | | | merge-recursive: do not look at the index during recursive mergeew/empty-merge-with-dirty-index-maint | Junio C Hamano | 2018-01-09 | 2 | -1/+51 |
* | | | | | | | Merge branch 'ma/bisect-leakfix' | Junio C Hamano | 2018-01-10 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bisect: fix a regression causing a segfaultma/bisect-leakfix | Ævar Arnfjörð Bjarmason | 2018-01-03 | 1 | -2/+4 |
* | | | | | | | | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' | Junio C Hamano | 2018-01-10 | 2 | -3/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase -p: fix quoting when calling `git merge` | Johannes Schindelin | 2018-01-05 | 2 | -3/+20 |
* | | | | | | | | | Merge branch 'jk/doc-diff-options' | Junio C Hamano | 2018-01-09 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | docs/diff-options: clarify scope of diff-filter typesjk/doc-diff-options | Jeff King | 2018-01-04 | 1 | -0/+6 |
* | | | | | | | | | | Merge branch 'bw/protocol-v1' | Junio C Hamano | 2018-01-09 | 1 | -6/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | http: fix v1 protocol tests with apache httpd < 2.4bw/protocol-v1 | Todd Zullinger | 2018-01-04 | 1 | -6/+4 |
* | | | | | | | | | | | Merge branch 'sg/travis-check-untracked' | Junio C Hamano | 2018-01-09 | 4 | -2/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | travis-ci: check that all build artifacts are .gitignore-dsg/travis-check-untracked | SZEDER Gábor | 2018-01-03 | 4 | -0/+20 |
| * | | | | | | | | | | | travis-ci: don't store P4 and Git LFS in the working tree | SZEDER Gábor | 2018-01-03 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge branch 'js/test-with-ws-in-path' | Junio C Hamano | 2018-01-09 | 5 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | t0302 & t3900: add forgotten quotes | Johannes Schindelin | 2018-01-03 | 2 | -5/+5 |
| * | | | | | | | | | | | Allow the test suite to pass in a directory whose name contains spaces | Johannes Schindelin | 2018-01-03 | 3 | -5/+5 |
* | | | | | | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc' | Junio C Hamano | 2018-01-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | doc/SubmittingPatches: improve text formattingbc/submitting-patches-in-asciidoc | Todd Zullinger | 2018-01-03 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'sg/travis-skip-identical-test' | Junio C Hamano | 2018-01-09 | 6 | -2/+60 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | travis-ci: record and skip successfully built treessg/travis-skip-identical-test | SZEDER Gábor | 2018-01-02 | 6 | -0/+57 |
| * | | | | | | | | | | | | travis-ci: create the cache directory early in the build process | SZEDER Gábor | 2018-01-02 | 2 | -1/+2 |
| * | | | | | | | | | | | | travis-ci: print the "tip of branch is exactly at tag" message in color | SZEDER Gábor | 2018-01-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'ab/dc-sha1-loose-ends' | Junio C Hamano | 2018-01-09 | 2 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1ab/dc-sha1-loose-ends | Ævar Arnfjörð Bjarmason | 2017-12-28 | 2 | -3/+0 |
* | | | | | | | | | | | | | | Merge branch 'sg/travis-fixes' | Junio C Hamano | 2018-01-09 | 6 | -1/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | travis-ci: only print test failures if there are test results availablesg/travis-fixes | SZEDER Gábor | 2017-12-27 | 1 | -0/+6 |
| * | | | | | | | | | | | | | travis-ci: save prove state for the 32 bit Linux build | SZEDER Gábor | 2017-12-27 | 2 | -0/+2 |
| * | | | | | | | | | | | | | travis-ci: don't install default addon packages for the 32 bit Linux build | SZEDER Gábor | 2017-12-27 | 1 | -0/+1 |
| * | | | | | | | | | | | | | travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts | SZEDER Gábor | 2017-12-27 | 4 | -1/+13 |
* | | | | | | | | | | | | | | Merge branch 'js/misc-git-gui-stuff' of ../git-gui | Junio C Hamano | 2018-01-09 | 2 | -1/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | git-gui: allow Ctrl+T to toggle multiple paths | Johannes Schindelin | 2018-01-09 | 1 | -0/+13 |
| * | | | | | | | | | | | | | git-gui: fix exception when trying to stage with empty file list | Johannes Schindelin | 2018-01-09 | 1 | -2/+10 |
| * | | | | | | | | | | | | | git-gui: avoid exception upon Ctrl+T in an empty list | Johannes Schindelin | 2018-01-09 | 1 | -0/+4 |
| * | | | | | | | | | | | | | git gui: fix staging a second line to a 1-line file | Johannes Schindelin | 2018-01-09 | 1 | -0/+1 |
* | | | | | | | | | | | | | | Git 2.16-rc1v2.16.0-rc1test | Junio C Hamano | 2018-01-05 | 2 | -1/+12 |