summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-08-13merge-recursive: fix verbose output for multiple base treesLibravatar René Scharfe2-4/+19
2016-08-13commit: factor out set_merge_remote_desc()Libravatar René Scharfe2-7/+14
2016-08-13commit: use xstrdup() in get_merge_parent()Libravatar René Scharfe1-1/+1
2016-08-12Git 2.9.3Libravatar Junio C Hamano3-2/+13
2016-08-12Merge branch 'jk/difftool-in-subdir' into maintLibravatar Junio C Hamano2-59/+41
2016-08-12Merge branch 'jk/reset-ident-time-per-commit' into maintLibravatar Junio C Hamano3-0/+8
2016-08-10Yet another batch for 2.9.3Libravatar Junio C Hamano1-0/+68
2016-08-10Merge branch 'jh/clean-smudge-f-doc' into maintLibravatar Junio C Hamano1-0/+5
2016-08-10Merge branch 'rs/use-strbuf-addstr' into maintLibravatar Junio C Hamano7-9/+9
2016-08-10Merge branch 'cp/completion-clone-recurse-submodules' into maintLibravatar Junio C Hamano1-0/+1
2016-08-10Merge branch 'jk/t4205-cleanup' into maintLibravatar Junio C Hamano1-198/+200
2016-08-10Merge branch 'jc/hashmap-doc-init' into maintLibravatar Junio C Hamano1-0/+5
2016-08-10Merge branch 'js/nedmalloc-gcc6-warnings' into maintLibravatar Junio C Hamano1-9/+8
2016-08-10Merge branch 'nd/fbsd-lazy-mtime' into maintLibravatar Junio C Hamano1-1/+16
2016-08-10Merge branch 'ab/gitweb-link-html-escape' into maintLibravatar Junio C Hamano1-1/+1
2016-08-10Merge branch 'js/t4130-rename-without-ino' into maintLibravatar Junio C Hamano1-3/+7
2016-08-10Merge branch 'jc/grep-commandline-vs-configuration' into maintLibravatar Junio C Hamano4-16/+29
2016-08-10Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintLibravatar Junio C Hamano2-0/+18
2016-08-10Merge branch 'pm/build-persistent-https-with-recent-go' into maintLibravatar Junio C Hamano1-2/+4
2016-08-10Merge branch 'da/subtree-2.9-regression' into maintLibravatar Junio C Hamano2-8/+25
2016-08-10Merge branch 'os/no-verify-skips-commit-msg-too' into maintLibravatar Junio C Hamano1-1/+1
2016-08-10Merge branch 'rs/rm-strbuf-optim' into maintLibravatar Junio C Hamano1-2/+3
2016-08-10Merge branch 'jk/parse-options-concat' into maintLibravatar Junio C Hamano3-22/+22
2016-08-10Merge branch 'ls/travis-enable-httpd-tests' into maintLibravatar Junio C Hamano1-0/+2
2016-08-10Merge branch 'ew/autoconf-pthread' into maintLibravatar Junio C Hamano1-0/+5
2016-08-10Merge branch 'rs/help-c-source-with-gitattributes' into maintLibravatar Junio C Hamano1-1/+1
2016-08-10Merge branch 'mm/status-suggest-merge-abort' into maintLibravatar Junio C Hamano3-2/+10
2016-08-08Hopefully final batch for 2.9.3Libravatar Junio C Hamano1-0/+34
2016-08-08Merge branch 'sb/pack-protocol-doc-nak' into maintLibravatar Junio C Hamano1-1/+1
2016-08-08Merge branch 'rs/submodule-config-code-cleanup' into maintLibravatar Junio C Hamano3-17/+28
2016-08-08Merge branch 'sb/submodule-deinit-all' into maintLibravatar Junio C Hamano1-2/+0
2016-08-08Merge branch 'rs/worktree-use-strbuf-absolute-path' into maintLibravatar Junio C Hamano1-2/+2
2016-08-08Merge branch 'jc/doc-diff-filter-exclude' into maintLibravatar Junio C Hamano1-0/+3
2016-08-08Merge branch 'nd/test-helpers' into maintLibravatar Junio C Hamano2-11/+3
2016-08-08Merge branch 'rs/use-strbuf-addbuf' into maintLibravatar Junio C Hamano5-8/+11
2016-08-08Merge branch 'lf/recv-sideband-cleanup' into maintLibravatar Junio C Hamano1-74/+58
2016-08-08Merge branch 'ah/unpack-trees-advice-messages' into maintLibravatar Junio C Hamano4-16/+16
2016-08-08Merge branch 'lf/sideband-returns-void' into maintLibravatar Junio C Hamano3-15/+10
2016-08-08Merge branch 'jk/send-pack-stdio' into maintLibravatar Junio C Hamano3-29/+16
2016-08-08Merge branch 'pb/commit-editmsg-path' into maintLibravatar Junio C Hamano1-7/+8
2016-08-08Merge branch 'ew/find-perl-on-freebsd-in-local' into maintLibravatar Junio C Hamano1-0/+1
2016-08-08Merge branch 'ew/daemon-socket-keepalive' into maintLibravatar Junio C Hamano2-3/+8
2016-08-08Merge branch 'nd/pack-ofs-4gb-limit' into maintLibravatar Junio C Hamano9-29/+54
2016-08-08Merge branch 'rs/notes-merge-no-toctou' into maintLibravatar Junio C Hamano1-5/+1
2016-08-08Merge branch 'js/ignore-space-at-eol' into maintLibravatar Junio C Hamano3-3/+13
2016-08-08Merge branch 'jk/push-scrub-url' into maintLibravatar Junio C Hamano2-2/+14
2016-08-08Merge branch 'nd/cache-tree-ita' into maintLibravatar Junio C Hamano15-53/+87
2016-08-08Merge branch 'mh/blame-worktree' into maintLibravatar Junio C Hamano2-18/+71
2016-08-05nedmalloc: work around overzealous GCC 6 warningLibravatar René Scharfe1-5/+4
2016-08-05use strbuf_addstr() instead of strbuf_addf() with "%s"Libravatar René Scharfe3-3/+3