summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-08-01merge-recursive: flush output buffer even when erroring outJohannes Schindelin
2016-08-01merge_trees(): ensure that the callers release output bufferJohannes Schindelin
2016-08-01merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin
2016-08-01merge-recursive: write the commit title in one goJohannes Schindelin
2016-08-01merge-recursive: flush output buffer before printing error messagesJohannes Schindelin
2016-07-26am -3: use merge_recursive() directly againJohannes Schindelin
2016-07-26merge-recursive: switch to returning errors instead of dyingJohannes Schindelin
2016-07-26merge-recursive: handle return values indicating errorsJohannes Schindelin
2016-07-26merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin
2016-07-26merge-recursive: avoid returning a wholesale structJohannes Schindelin
2016-07-26merge_recursive: abort properly upon errorsJohannes Schindelin
2016-07-26prepare the builtins for a libified merge_recursive()Johannes Schindelin
2016-07-26merge-recursive: clarify code in was_tracked()Johannes Schindelin
2016-07-26die(_("BUG")): avoid translating bug messagesJohannes Schindelin
2016-07-26die("bug"): report bugs consistentlyJohannes Schindelin
2016-07-26t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin
2016-07-25Seventh batch of topics for 2.10Junio C Hamano
2016-07-25Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano
2016-07-25Merge branch 'ew/autoconf-pthread'Junio C Hamano
2016-07-25Merge branch 'mh/blame-worktree'Junio C Hamano
2016-07-25Merge branch 'js/fsck-name-object'Junio C Hamano
2016-07-25Merge branch 'nd/cache-tree-ita'Junio C Hamano
2016-07-25Merge branch 'jk/push-scrub-url'Junio C Hamano
2016-07-25Merge branch 'nd/test-helpers'Junio C Hamano
2016-07-25Merge branch 'jc/doc-diff-filter-exclude'Junio C Hamano
2016-07-25Merge branch 'ls/travis-enable-httpd-tests'Junio C Hamano
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano
2016-07-25Merge branch 'rs/worktree-use-strbuf-absolute-path'Junio C Hamano
2016-07-25Merge branch 'rs/rm-strbuf-optim'Junio C Hamano
2016-07-25Merge branch 'rw/make-needs-librt'Junio C Hamano
2016-07-25Merge branch 'js/ignore-space-at-eol'Junio C Hamano
2016-07-25Merge branch 'mh/ref-iterators'Junio C Hamano
2016-07-25Merge branch 'mh/update-ref-errors'Junio C Hamano
2016-07-25Merge branch 'mh/split-under-lock'Junio C Hamano
2016-07-22strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()René Scharfe
2016-07-20t5541: fix url scrubbing test when GPG is not setJeff King
2016-07-19Sixth batch of topics for 2.10Junio C Hamano
2016-07-19Merge branch 'ls/p4-tmp-refs'Junio C Hamano
2016-07-19Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano
2016-07-19Merge branch 'jk/write-file'Junio C Hamano
2016-07-19Merge branch 'jk/printf-format'Junio C Hamano
2016-07-19Merge branch 'rs/help-c-source-with-gitattributes'Junio C Hamano
2016-07-19Merge branch 'nd/fetch-ref-summary'Junio C Hamano
2016-07-19Merge branch 'jk/test-match-signal'Junio C Hamano
2016-07-19Merge branch 'jk/common-main'Junio C Hamano
2016-07-19Merge branch 'ak/lazy-prereq-mktemp'Junio C Hamano
2016-07-19Merge branch 'nd/icase'Junio C Hamano
2016-07-19Merge branch 'bc/cocci'Junio C Hamano
2016-07-19Merge branch 'js/log-to-diffopt-file'Junio C Hamano
2016-07-19Merge branch 'sb/submodule-parallel-fetch'Junio C Hamano