summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-08-01merge_trees(): ensure that the callers release output bufferLibravatar Johannes Schindelin3-0/+4
2016-08-01merge-recursive: offer an option to retain the output in 'obuf'Libravatar Johannes Schindelin2-5/+14
2016-08-01merge-recursive: write the commit title in one goLibravatar Johannes Schindelin1-8/+9
2016-08-01merge-recursive: flush output buffer before printing error messagesLibravatar Johannes Schindelin1-48/+68
2016-07-26am -3: use merge_recursive() directly againLibravatar Johannes Schindelin1-40/+22
2016-07-26merge-recursive: switch to returning errors instead of dyingLibravatar Johannes Schindelin1-27/+35
2016-07-26merge-recursive: handle return values indicating errorsLibravatar Johannes Schindelin1-102/+150
2016-07-26merge-recursive: allow write_tree_from_memory() to error outLibravatar Johannes Schindelin1-2/+2
2016-07-26merge-recursive: avoid returning a wholesale structLibravatar Johannes Schindelin1-50/+56
2016-07-26merge_recursive: abort properly upon errorsLibravatar Johannes Schindelin1-5/+12
2016-07-26prepare the builtins for a libified merge_recursive()Libravatar Johannes Schindelin3-1/+9
2016-07-26merge-recursive: clarify code in was_tracked()Libravatar Johannes Schindelin1-16/+14
2016-07-26die(_("BUG")): avoid translating bug messagesLibravatar Johannes Schindelin1-3/+3
2016-07-26die("bug"): report bugs consistentlyLibravatar Johannes Schindelin9-21/+21
2016-07-26t5520: verify that `pull --rebase` shows the helpful advice when failingLibravatar Johannes Schindelin1-0/+32
2016-07-25Seventh batch of topics for 2.10Libravatar Junio C Hamano1-0/+69
2016-07-25Merge branch 'rs/use-strbuf-addbuf'Libravatar Junio C Hamano5-8/+11
2016-07-25Merge branch 'ew/autoconf-pthread'Libravatar Junio C Hamano1-0/+5
2016-07-25Merge branch 'mh/blame-worktree'Libravatar Junio C Hamano2-18/+71
2016-07-25Merge branch 'js/fsck-name-object'Libravatar Junio C Hamano5-31/+200
2016-07-25Merge branch 'nd/cache-tree-ita'Libravatar Junio C Hamano15-53/+87
2016-07-25Merge branch 'jk/push-scrub-url'Libravatar Junio C Hamano2-2/+14
2016-07-25Merge branch 'nd/test-helpers'Libravatar Junio C Hamano2-11/+3
2016-07-25Merge branch 'jc/doc-diff-filter-exclude'Libravatar Junio C Hamano1-0/+3
2016-07-25Merge branch 'ls/travis-enable-httpd-tests'Libravatar Junio C Hamano1-0/+2
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Libravatar Junio C Hamano10-90/+112
2016-07-25Merge branch 'rs/worktree-use-strbuf-absolute-path'Libravatar Junio C Hamano1-2/+2
2016-07-25Merge branch 'rs/rm-strbuf-optim'Libravatar Junio C Hamano1-2/+3
2016-07-25Merge branch 'rw/make-needs-librt'Libravatar Junio C Hamano2-3/+11
2016-07-25Merge branch 'js/ignore-space-at-eol'Libravatar Junio C Hamano3-3/+13
2016-07-25Merge branch 'mh/ref-iterators'Libravatar Junio C Hamano11-324/+1460
2016-07-25Merge branch 'mh/update-ref-errors'Libravatar Junio C Hamano3-213/+449
2016-07-25Merge branch 'mh/split-under-lock'Libravatar Junio C Hamano10-260/+1016
2016-07-22strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()Libravatar René Scharfe2-5/+8
2016-07-20t5541: fix url scrubbing test when GPG is not setLibravatar Jeff King1-2/+4
2016-07-19Sixth batch of topics for 2.10Libravatar Junio C Hamano1-0/+70
2016-07-19Merge branch 'ls/p4-tmp-refs'Libravatar Junio C Hamano2-3/+3
2016-07-19Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Libravatar Junio C Hamano1-8/+8
2016-07-19Merge branch 'jk/write-file'Libravatar Junio C Hamano6-102/+44
2016-07-19Merge branch 'jk/printf-format'Libravatar Junio C Hamano6-20/+14
2016-07-19Merge branch 'rs/help-c-source-with-gitattributes'Libravatar Junio C Hamano1-1/+1
2016-07-19Merge branch 'nd/fetch-ref-summary'Libravatar Junio C Hamano4-40/+243
2016-07-19Merge branch 'jk/test-match-signal'Libravatar Junio C Hamano3-11/+26
2016-07-19Merge branch 'jk/common-main'Libravatar Junio C Hamano53-151/+124
2016-07-19Merge branch 'ak/lazy-prereq-mktemp'Libravatar Junio C Hamano1-1/+6
2016-07-19Merge branch 'nd/icase'Libravatar Junio C Hamano11-21/+291
2016-07-19Merge branch 'bc/cocci'Libravatar Junio C Hamano25-283/+403
2016-07-19Merge branch 'js/log-to-diffopt-file'Libravatar Junio C Hamano9-107/+144
2016-07-19Merge branch 'sb/submodule-parallel-fetch'Libravatar Junio C Hamano1-16/+27
2016-07-19Merge branch 'lf/recv-sideband-cleanup'Libravatar Junio C Hamano1-74/+58
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 11:01:18 +0000