summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: flush output buffer even when erroring outjs/am-3-merge-recursive-directJohannes Schindelin2016-08-011-1/+3
* merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-013-0/+4
* merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin2016-08-012-5/+14
* merge-recursive: write the commit title in one goJohannes Schindelin2016-08-011-8/+9
* merge-recursive: flush output buffer before printing error messagesJohannes Schindelin2016-08-011-48/+68
* am -3: use merge_recursive() directly againJohannes Schindelin2016-07-261-40/+22
* merge-recursive: switch to returning errors instead of dyingJohannes Schindelin2016-07-261-27/+35
* merge-recursive: handle return values indicating errorsJohannes Schindelin2016-07-261-102/+150
* merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin2016-07-261-2/+2
* merge-recursive: avoid returning a wholesale structJohannes Schindelin2016-07-261-50/+56
* merge_recursive: abort properly upon errorsJohannes Schindelin2016-07-261-5/+12
* prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-263-1/+9
* merge-recursive: clarify code in was_tracked()Johannes Schindelin2016-07-261-16/+14
* die(_("BUG")): avoid translating bug messagesJohannes Schindelin2016-07-261-3/+3
* die("bug"): report bugs consistentlyJohannes Schindelin2016-07-269-21/+21
* t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin2016-07-261-0/+32
* 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
|\ \ \ \ \ \ \ \
View Lorry Controller Status