summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add is_worktree_locked()Nguyễn Thái Ngọc Duy2016-06-132-0/+36
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add is_main_worktree()Nguyễn Thái Ngọc Duy2016-06-032-0/+10
| * | | | | | | | | | | | | | | | | | | | | | worktree.c: add find_worktree()Nguyễn Thái Ngọc Duy2016-06-032-0/+23
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/notes-merge-no-toctou'Junio C Hamano2016-07-281-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | notes-merge: use O_EXCL to avoid overwriting existing filesrs/notes-merge-no-toctouRené Scharfe2016-07-071-5/+1
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-tests'Junio C Hamano2016-07-282-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | rebase -i: we allow extra spaces after fixup!/squash!js/rebase-i-testsJohannes Schindelin2016-07-071-0/+9
| * | | | | | | | | | | | | | | | | | | | | | | rebase -i: demonstrate a bug with --autosquashJohannes Schindelin2016-07-071-0/+24
| * | | | | | | | | | | | | | | | | | | | | | | t3404: add a test for the --gpg-sign optionJohannes Schindelin2016-07-071-0/+8
* | | | | | | | | | | | | | | | | | | | | | | | Seventh batch of topics for 2.10Junio C Hamano2016-07-251-0/+69
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano2016-07-255-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()rs/use-strbuf-addbufRené Scharfe2016-07-222-5/+8
| * | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe2016-07-193-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/autoconf-pthread'Junio C Hamano2016-07-251-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | configure.ac: stronger test for pthread linkageew/autoconf-pthreadEric Wong2016-07-181-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-07-252-18/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | t/t8003-blame-corner-cases.sh: Use here documentsMike Hommey2016-07-181-17/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-182-1/+54
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/fsck-name-object'Junio C Hamano2016-07-255-31/+200
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | fsck: optionally show more helpful info for broken linksJohannes Schindelin2016-07-184-9/+85
| * | | | | | | | | | | | | | | | | | | | | | | | | | fsck: give the error function a chance to see the fsck_optionsJohannes Schindelin2016-07-183-5/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | fsck_walk(): optionally name objects on the goJohannes Schindelin2016-07-182-4/+84
| * | | | | | | | | | | | | | | | | | | | | | | | | | fsck: refactor how to describe objectsJohannes Schindelin2016-07-181-14/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/cache-tree-ita'Junio C Hamano2016-07-2515-53/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesnd/cache-tree-itaNguyễn Thái Ngọc Duy2016-07-182-1/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimesNguyễn Thái Ngọc Duy2016-07-182-2/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib.sh: introduce and use $EMPTY_BLOBNguyễn Thái Ngọc Duy2016-07-188-38/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib.sh: introduce and use $EMPTY_TREENguyễn Thái Ngọc Duy2016-07-186-13/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-scrub-url'Junio C Hamano2016-07-252-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5541: fix url scrubbing test when GPG is not setjk/push-scrub-urlJeff King2016-07-201-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | push: anonymize URL in status outputJeff King2016-07-142-2/+12
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-07-252-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t/test-lib.sh: fix running tests with --valgrindJohannes Schindelin2016-07-111-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: use VCSSVN_LIB to refer to svn libraryJeff King2016-07-061-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: drop extra dependencies for test helpersJeff King2016-07-061-8/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-diff-filter-exclude'Junio C Hamano2016-07-251-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: document diff-filter exclusionjc/doc-diff-filter-excludeJunio C Hamano2016-07-141-0/+3
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/travis-enable-httpd-tests'Junio C Hamano2016-07-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | travis-ci: enable web server tests t55xx on Linuxls/travis-enable-httpd-testsLars Schneider2016-07-121-0/+2
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-2510-90/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-124-31/+43
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-067-59/+69
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/worktree-use-strbuf-absolute-path'Junio C Hamano2016-07-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: use strbuf_add_absolute_path() directlyrs/worktree-use-strbuf-absolute-pathRené Scharfe2016-07-121-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/rm-strbuf-optim'Junio C Hamano2016-07-251-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rm: reuse strbuf for all remove_dir_recursively() callsrs/rm-strbuf-optimRené Scharfe2016-07-121-2/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rw/make-needs-librt'Junio C Hamano2016-07-252-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.mak.uname: define NEEDS_LIBRT under Linux, for nowrw/make-needs-librtEric Wong2016-07-111-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: add NEEDS_LIBRT to optionally link with librtRonald Wampler2016-07-071-3/+9
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/ignore-space-at-eol'Junio C Hamano2016-07-253-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \