]> git.ipfire.org Git - thirdparty/git.git/history - commit.c
merge-recursive: fix verbose output for multiple base trees
[thirdparty/git.git] / commit.c
2016-08-14  René Scharfecommit: factor out set_merge_remote_desc()
2016-08-14  René Scharfecommit: use xstrdup() in get_merge_parent()
2016-08-12  Junio C HamanoMerge branch 'jk/difftool-in-subdir' into maint
2016-08-12  Junio C HamanoMerge branch 'jk/reset-ident-time-per-commit' into...
2016-08-10  Junio C HamanoMerge branch 'cp/completion-clone-recurse-submodules...
2016-08-10  Junio C HamanoMerge branch 'jk/t4205-cleanup' into maint
2016-08-10  Junio C HamanoMerge branch 'jc/hashmap-doc-init' into maint
2016-08-10  Junio C HamanoMerge branch 'ab/gitweb-link-html-escape' into maint
2016-08-10  Junio C HamanoMerge branch 'js/t4130-rename-without-ino' into maint
2016-08-10  Junio C HamanoMerge branch 'jc/grep-commandline-vs-configuration...
2016-08-10  Junio C HamanoMerge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning...
2016-08-10  Junio C HamanoMerge branch 'pm/build-persistent-https-with-recent...
2016-08-10  Junio C HamanoMerge branch 'da/subtree-2.9-regression' into maint
2016-08-10  Junio C HamanoMerge branch 'os/no-verify-skips-commit-msg-too' into...
2016-08-10  Junio C HamanoMerge branch 'rs/rm-strbuf-optim' into maint
2016-08-10  Junio C HamanoMerge branch 'jk/parse-options-concat' into maint
2016-08-10  Junio C HamanoMerge branch 'ls/travis-enable-httpd-tests' into maint
2016-08-10  Junio C HamanoMerge branch 'ew/autoconf-pthread' into maint
2016-08-10  Junio C HamanoMerge branch 'rs/help-c-source-with-gitattributes'...
2016-08-10  Junio C HamanoMerge branch 'mm/status-suggest-merge-abort' into maint
2016-08-08  Junio C HamanoMerge branch 'sb/pack-protocol-doc-nak' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/submodule-config-code-cleanup' into...
2016-08-08  Junio C HamanoMerge branch 'sb/submodule-deinit-all' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/worktree-use-strbuf-absolute-path...
2016-08-08  Junio C HamanoMerge branch 'jc/doc-diff-filter-exclude' into maint
2016-08-08  Junio C HamanoMerge branch 'nd/test-helpers' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/use-strbuf-addbuf' into maint
2016-08-08  Junio C HamanoMerge branch 'lf/recv-sideband-cleanup' into maint
2016-08-08  Junio C HamanoMerge branch 'ah/unpack-trees-advice-messages' into...
2016-08-08  Junio C HamanoMerge branch 'lf/sideband-returns-void' into maint
2016-08-08  Junio C HamanoMerge branch 'jk/send-pack-stdio' into maint
2016-08-08  Junio C HamanoMerge branch 'pb/commit-editmsg-path' into maint
2016-08-08  Junio C HamanoMerge branch 'ew/find-perl-on-freebsd-in-local' into...
2016-08-08  Junio C HamanoMerge branch 'ew/daemon-socket-keepalive' into maint
2016-08-08  Junio C HamanoMerge branch 'nd/pack-ofs-4gb-limit' into maint
2016-08-08  Junio C HamanoMerge branch 'rs/notes-merge-no-toctou' into maint
2016-08-08  Junio C HamanoMerge branch 'js/ignore-space-at-eol' into maint
2016-08-08  Junio C HamanoMerge branch 'jk/push-scrub-url' into maint
2016-08-08  Junio C HamanoMerge branch 'nd/cache-tree-ita' into maint
2016-08-08  Junio C HamanoMerge branch 'mh/blame-worktree' into maint
2016-07-28  Junio C HamanoMerge branch 'ak/lazy-prereq-mktemp' into maint
2016-07-28  Junio C HamanoMerge branch 'nd/icase' into maint
2016-07-28  Junio C HamanoMerge branch 'sb/submodule-parallel-fetch' into maint
2016-07-28  Junio C HamanoMerge branch 'dk/blame-move-no-reason-for-1-line-contex...
2016-07-28  Junio C HamanoMerge branch 'jk/test-match-signal' into maint
2016-07-28  Junio C HamanoMerge branch 'js/am-call-theirs-theirs-in-fallback...
2016-07-28  Junio C HamanoMerge branch 'js/t3404-grammo-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'nd/doc-new-command' into maint
2016-07-28  Junio C HamanoMerge branch 'ew/gc-auto-pack-limit-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'js/color-on-windows-comment' into maint
2016-07-28  Junio C HamanoMerge branch 'mm/doc-tt' into maint
2016-07-28  Junio C HamanoMerge branch 'js/sign-empty-commit-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'ps/rebase-i-auto-unstash-upon-abort'...
2016-07-28  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-07-28  Junio C HamanoMerge branch 'js/find-commit-subject-ignore-leading...
2016-07-28  Junio C HamanoMerge branch 'dg/subtree-rebase-test' into maint
2016-07-11  Junio C HamanoMerge branch 'cb/t7810-test-label-fix' into maint
2016-07-11  Junio C HamanoMerge branch 'sb/t5614-modernize' into maint
2016-07-11  Junio C HamanoMerge branch 'ao/p4-has-branch-prefix-fix' into maint
2016-07-11  Junio C HamanoMerge branch 'ak/t7800-wo-readlink' into maint
2016-07-11  Junio C HamanoMerge branch 'lc/shell-default-value-noexpand' into...
2016-07-11  Junio C HamanoMerge branch 'sb/clone-shallow-passthru' into maint
2016-07-11  Junio C HamanoMerge branch 'jk/bisect-show-tree' into maint
2016-07-06  Junio C HamanoMerge branch 'jc/deref-tag' into maint
2016-07-06  Junio C HamanoMerge branch 'pb/strbuf-read-file-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'jk/fetch-prune-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'mg/cherry-pick-multi-on-unborn' into...
2016-07-06  Junio C HamanoMerge branch 'em/newer-freebsd-shells-are-fine-with...
2016-07-06  Junio C HamanoMerge branch 'nb/gnome-keyring-build' into maint
2016-07-06  Junio C HamanoMerge branch 'jk/avoid-unbounded-alloca' into maint
2016-07-06  Junio C HamanoMerge branch 'vs/prompt-avoid-unset-variable' into...
2016-07-06  Junio C HamanoMerge branch 'dn/gpg-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'ap/git-svn-propset-doc' into maint
2016-06-29  Johannes Schindelincommit -S: avoid invalid pointer with empty message
2016-06-27  Junio C HamanoMerge branch 'jk/rev-list-count-with-bitmap' into maint
2016-06-22  Johannes Schindelincommit.c: make find_commit_subject() more robust
2016-06-10  Junio C HamanoMerge branch 'jk/diff-compact-heuristic'
2016-06-06  Junio C HamanoMerge branch 'ar/diff-args-osx-precompose' into maint
2016-06-03  Junio C HamanoMerge branch 'rs/apply-name-terminate'
2016-06-03  Junio C HamanoMerge branch 'rs/patch-id-use-skip-prefix'
2016-06-03  Junio C HamanoMerge branch 'pa/cherry-pick-doc-typo'
2016-06-03  Junio C HamanoMerge branch 'js/rebase-i-dedup-call-to-rerere'
2016-05-31  Junio C HamanoMerge branch 'bn/http-cookiefile-config' into maint
2016-05-31  Junio C HamanoMerge branch 'jk/test-send-sh-x-trace-elsewhere' into...
2016-05-31  Junio C HamanoMerge branch 'js/name-rev-use-oldest-ref' into maint
2016-05-31  Junio C HamanoMerge branch 'jk/cat-file-buffered-batch-all'
2016-05-30  Junio C HamanoMerge branch 'ak/t0008-ksh88-workaround'
2016-05-30  Junio C HamanoMerge branch 'rj/log-decorate-auto'
2016-05-26  Junio C HamanoMerge branch 'sb/z-is-gnutar-ism' into maint
2016-05-26  Junio C HamanoMerge branch 'bn/config-doc-tt-varnames' into maint
2016-05-26  Junio C HamanoMerge branch 'nd/remote-plural-ours-plus-theirs' into...
2016-05-26  Junio C HamanoMerge branch 'ak/t4151-ls-files-could-be-empty' into...
2016-05-26  Junio C HamanoMerge branch 'jc/test-seq' into maint
2016-05-26  Junio C HamanoMerge branch 'tb/t5601-sed-fix' into maint
2016-05-26  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' into maint
2016-05-26  Junio C HamanoMerge branch 'jk/war-on-sprintf' into maint-2.7
2016-05-23  Junio C HamanoMerge branch 'jc/rerere-multi'
2016-05-23  Junio C HamanoMerge branch 'ar/diff-args-osx-precompose'
2016-05-23  Junio C HamanoMerge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
2016-05-18  Junio C HamanoMerge branch 'sb/clean-test-fix' into HEAD
next