git.oblomov.eu Git - git/history - builtin/merge-recursive.c

2016-08-04	Junio C Hamano	Merge branch 'jc/grep-commandline-vs-configuration'	blob \| commitdiff \| raw
2016-08-04	Junio C Hamano	Merge branch 'sb/submodule-clone-retry'	blob \| commitdiff \| raw
2016-08-04	Junio C Hamano	Merge branch 'sb/pack-protocol-doc-nak'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'rs/submodule-config-code-cleanup'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'jt/fetch-large-handshake-window-on-http'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'jk/git-jump'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'mm/status-suggest-merge-abort'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'jk/parse-options-concat'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'sb/push-options'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'ew/http-walker'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'pm/build-persistent-https-with-recent-go'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'da/subtree-2.9-regression'	blob \| commitdiff \| raw
2016-08-03	Junio C Hamano	Merge branch 'os/no-verify-skips-commit-msg-too'	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Merge branch 'master' of git://git.bogomips.org/git-svn	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Merge branch 'js/t3404-grammo-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'nd/doc-new-command' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'ew/gc-auto-pack-limit-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/color-on-windows-comment' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/sign-empty-commit-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'ps/rebase-i-auto-unstash-upon-abort'...	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'nd/ita-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'js/find-commit-subject-ignore-leading...	blob \| commitdiff \| raw \| diff to current
2016-07-28	Junio C Hamano	Merge branch 'sb/submodule-deinit-all'	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Merge branch 'ew/find-perl-on-freebsd-in-local'	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Merge branch 'ew/daemon-socket-keepalive'	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Merge branch 'nd/pack-ofs-4gb-limit'	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Merge branch 'nd/worktree-lock'	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Merge branch 'rs/notes-merge-no-toctou'	blob \| commitdiff \| raw
2016-07-28	Junio C Hamano	Merge branch 'js/rebase-i-tests'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'rs/use-strbuf-addbuf'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'ew/autoconf-pthread'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'mh/blame-worktree'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'js/fsck-name-object'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'nd/cache-tree-ita'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'jk/push-scrub-url'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'nd/test-helpers'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'jc/doc-diff-filter-exclude'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'ls/travis-enable-httpd-tests'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'jc/renormalize-merge-kill-safer-crlf'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'rs/worktree-use-strbuf-absolute-path'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'rs/rm-strbuf-optim'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'rw/make-needs-librt'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'js/ignore-space-at-eol'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'mh/ref-iterators'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'mh/update-ref-errors'	blob \| commitdiff \| raw
2016-07-25	Junio C Hamano	Merge branch 'mh/split-under-lock'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'ls/p4-tmp-refs'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'js/am-call-theirs-theirs-in-fallback...	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'jk/write-file'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'jk/printf-format'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'rs/help-c-source-with-gitattributes'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'nd/fetch-ref-summary'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'jk/test-match-signal'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'jk/common-main'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'ak/lazy-prereq-mktemp'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'nd/icase'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'bc/cocci'	blob \| commitdiff \| raw
2016-07-19	Junio C Hamano	Merge branch 'lf/recv-sideband-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'nd/ita-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'ps/rebase-i-auto-unstash-upon-abort'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'js/t3404-grammo-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'js/sign-empty-commit-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'nd/doc-new-command'	blob \| commitdiff \| raw \| diff to current
2016-07-13	Junio C Hamano	Merge branch 'ew/gc-auto-pack-limit-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'ao/p4-has-branch-prefix-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'ak/t7800-wo-readlink' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'lc/shell-default-value-noexpand' into...	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jk/bisect-show-tree' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'js/color-on-windows-comment'	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'js/find-commit-subject-ignore-leading...	blob \| commitdiff \| raw \| diff to current
2016-07-11	Junio C Hamano	Merge branch 'jk/ansi-color'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'ao/p4-has-branch-prefix-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'cb/t7810-test-label-fix'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'ak/t7800-wo-readlink'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'lc/shell-default-value-noexpand'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/bisect-show-tree'	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jc/deref-tag' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'pb/strbuf-read-file-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/fetch-prune-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'mg/cherry-pick-multi-on-unborn' into...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'em/newer-freebsd-shells-are-fine-with...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'nb/gnome-keyring-build' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'jk/avoid-unbounded-alloca' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'vs/prompt-avoid-unset-variable' into...	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'dn/gpg-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-07-06	Junio C Hamano	Merge branch 'ap/git-svn-propset-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-28	brian m. carlson	merge-recursive: convert merge_recursive_generic()...	blob \| commitdiff \| raw
2016-06-27	Junio C Hamano	Merge branch 'mg/cherry-pick-multi-on-unborn'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'em/newer-freebsd-shells-are-fine-with...	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'nb/gnome-keyring-build'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'jc/deref-tag'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'jk/avoid-unbounded-alloca'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'vs/prompt-avoid-unset-variable'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'pb/strbuf-read-file-doc'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'dn/gpg-doc'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'jk/fetch-prune-doc'	blob \| commitdiff \| raw \| diff to current
2016-06-27	Junio C Hamano	Merge branch 'ap/git-svn-propset-doc'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom