summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* read-cache: don't write index twice if we can't write shared indexnd/shared-index-fixNguyễn Thái Ngọc Duy2018-01-242-2/+22
* read-cache.c: move tempfile creation/cleanup out of write_shared_indexNguyễn Thái Ngọc Duy2018-01-161-16/+17
* read-cache.c: change type of "temp" in write_shared_index()Nguyễn Thái Ngọc Duy2018-01-161-9/+11
* RelNotes: minor typofixSZEDER Gábor2018-01-121-1/+1
* Git 2.16-rc2v2.16.0-rc2Junio C Hamano2018-01-111-1/+1
* Merge branch 'jh/object-filtering'Junio C Hamano2018-01-111-1/+1
|\
| * oidset: don't return value from oidset_initjh/object-filteringThomas Gummerer2018-01-081-1/+1
* | Merge branch 'tg/worktree-create-tracking'Junio C Hamano2018-01-111-1/+1
|\ \
| * | Documentation/git-worktree.txt: add missing `Ralf Thielow2018-01-111-1/+1
* | | Merge branch 'js/test-with-ws-in-path'Junio C Hamano2018-01-111-4/+4
|\ \ \
| * | | t3900: add some more quotesjs/test-with-ws-in-pathBeat Bolli2018-01-101-4/+4
* | | | RelNotes update before -rc2Junio C Hamano2018-01-101-0/+10
* | | | Merge branch 'js/perl-path-workaround-in-tests'Junio C Hamano2018-01-101-1/+16
|\ \ \ \
| * | | | mingw: handle GITPERLLIB in t0021 in a Windows-compatible wayjs/perl-path-workaround-in-testsJohannes Schindelin2018-01-101-1/+16
* | | | | Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano2018-01-102-1/+51
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...ew/empty-merge-with-dirty-indexJunio C Hamano2018-01-092-1/+51
| |\ \ \ \ \
| | * | | | | merge-recursive: do not look at the index during recursive mergeew/empty-merge-with-dirty-index-maintJunio C Hamano2018-01-092-1/+51
* | | | | | | Merge branch 'ma/bisect-leakfix'Junio C Hamano2018-01-101-2/+4
|\ \ \ \ \ \ \
| * | | | | | | bisect: fix a regression causing a segfaultma/bisect-leakfixÆvar Arnfjörð Bjarmason2018-01-031-2/+4
* | | | | | | | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano2018-01-102-3/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase -p: fix quoting when calling `git merge`Johannes Schindelin2018-01-052-3/+20
* | | | | | | | | Merge branch 'jk/doc-diff-options'Junio C Hamano2018-01-091-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs/diff-options: clarify scope of diff-filter typesjk/doc-diff-optionsJeff King2018-01-041-0/+6
* | | | | | | | | | Merge branch 'bw/protocol-v1'Junio C Hamano2018-01-091-6/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http: fix v1 protocol tests with apache httpd < 2.4bw/protocol-v1Todd Zullinger2018-01-041-6/+4
* | | | | | | | | | | Merge branch 'sg/travis-check-untracked'Junio C Hamano2018-01-094-2/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | travis-ci: check that all build artifacts are .gitignore-dsg/travis-check-untrackedSZEDER Gábor2018-01-034-0/+20
| * | | | | | | | | | | travis-ci: don't store P4 and Git LFS in the working treeSZEDER Gábor2018-01-031-2/+2
* | | | | | | | | | | | Merge branch 'js/test-with-ws-in-path'Junio C Hamano2018-01-095-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | t0302 & t3900: add forgotten quotesJohannes Schindelin2018-01-032-5/+5
| * | | | | | | | | | | Allow the test suite to pass in a directory whose name contains spacesJohannes Schindelin2018-01-033-5/+5
* | | | | | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc'Junio C Hamano2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc/SubmittingPatches: improve text formattingbc/submitting-patches-in-asciidocTodd Zullinger2018-01-031-1/+1
* | | | | | | | | | | | | Merge branch 'sg/travis-skip-identical-test'Junio C Hamano2018-01-096-2/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | travis-ci: record and skip successfully built treessg/travis-skip-identical-testSZEDER Gábor2018-01-026-0/+57
| * | | | | | | | | | | | travis-ci: create the cache directory early in the build processSZEDER Gábor2018-01-022-1/+2
| * | | | | | | | | | | | travis-ci: print the "tip of branch is exactly at tag" message in colorSZEDER Gábor2018-01-021-1/+1
* | | | | | | | | | | | | Merge branch 'ab/dc-sha1-loose-ends'Junio C Hamano2018-01-092-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1ab/dc-sha1-loose-endsÆvar Arnfjörð Bjarmason2017-12-282-3/+0
* | | | | | | | | | | | | | Merge branch 'sg/travis-fixes'Junio C Hamano2018-01-096-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | travis-ci: only print test failures if there are test results availablesg/travis-fixesSZEDER Gábor2017-12-271-0/+6
| * | | | | | | | | | | | | travis-ci: save prove state for the 32 bit Linux buildSZEDER Gábor2017-12-272-0/+2
| * | | | | | | | | | | | | travis-ci: don't install default addon packages for the 32 bit Linux buildSZEDER Gábor2017-12-271-0/+1
| * | | | | | | | | | | | | travis-ci: fine tune the use of 'set -x' in 'ci/*' scriptsSZEDER Gábor2017-12-274-1/+13
* | | | | | | | | | | | | | Merge branch 'js/misc-git-gui-stuff' of ../git-guiJunio C Hamano2018-01-092-1/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | git-gui: allow Ctrl+T to toggle multiple pathsJohannes Schindelin2018-01-091-0/+13
| * | | | | | | | | | | | | git-gui: fix exception when trying to stage with empty file listJohannes Schindelin2018-01-091-2/+10
| * | | | | | | | | | | | | git-gui: avoid exception upon Ctrl+T in an empty listJohannes Schindelin2018-01-091-0/+4
| * | | | | | | | | | | | | git gui: fix staging a second line to a 1-line fileJohannes Schindelin2018-01-091-0/+1
* | | | | | | | | | | | | | Git 2.16-rc1v2.16.0-rc1testJunio C Hamano2018-01-052-1/+12
View Lorry Controller Status