Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2016-08-08	Merge branch 'sb/submodule-recommend-shallowness'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/parseopt-string-list'	blob \| diff \| raw
2016-08-08	Merge branch 'jh/clean-smudge-f-doc'	blob \| diff \| raw
2016-08-08	Merge branch 'js/nedmalloc-gcc6-warnings'	blob \| diff \| raw
2016-08-08	Merge branch 'nd/fbsd-lazy-mtime'	blob \| diff \| raw
2016-08-08	Merge branch 'nd/log-decorate-color-head-arrow'	blob \| diff \| raw
2016-08-08	Merge branch 'rs/use-strbuf-addstr'	blob \| diff \| raw
2016-08-08	Merge branch 'ib/t3700-add-chmod-x-updates'	blob \| diff \| raw
2016-08-08	Merge branch 'ab/gitweb-link-html-escape'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/pack-objects-optim'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/difftool-in-subdir'	blob \| diff \| raw
2016-08-08	Merge branch 'js/rebase-i-progress-tidy'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/reflog-date'	blob \| diff \| raw
2016-08-08	Merge branch 'cp/completion-clone-recurse-submodules'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/t4205-cleanup'	blob \| diff \| raw
2016-08-08	Merge branch 'da/subtree-modernize'	blob \| diff \| raw
2016-08-08	Merge branch 'nd/fetch-ref-summary'	blob \| diff \| raw
2016-08-08	Merge branch 'ew/git-svn-http-tests'	blob \| diff \| raw
2016-08-08	Merge branch 'js/t4130-rename-without-ino'	blob \| diff \| raw
2016-08-04	Merge branch 'jc/grep-commandline-vs-configuration'	blob \| diff \| raw
2016-08-04	Merge branch 'sb/submodule-clone-retry'	blob \| diff \| raw
2016-08-04	Merge branch 'sb/pack-protocol-doc-nak'	blob \| diff \| raw
2016-08-03	Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'	blob \| diff \| raw
2016-08-03	Merge branch 'rs/submodule-config-code-cleanup'	blob \| diff \| raw
2016-08-03	Merge branch 'jk/push-progress'	blob \| diff \| raw
2016-08-03	Merge branch 'jt/fetch-large-handshake-window-on-http'	blob \| diff \| raw
2016-08-03	Merge branch 'jk/git-jump'	blob \| diff \| raw
2016-08-03	Merge branch 'mm/status-suggest-merge-abort'	blob \| diff \| raw
2016-08-03	Merge branch 'jk/parse-options-concat'	blob \| diff \| raw
2016-08-03	Merge branch 'sb/push-options'	blob \| diff \| raw
2016-08-03	Merge branch 'ew/http-walker'	blob \| diff \| raw
2016-08-03	Merge branch 'pm/build-persistent-https-with-recent-go'	blob \| diff \| raw
2016-08-03	Merge branch 'da/subtree-2.9-regression'	blob \| diff \| raw
2016-08-03	Merge branch 'os/no-verify-skips-commit-msg-too'	blob \| diff \| raw
2016-07-28	Sync with maint	blob \| diff \| raw
2016-07-28	Merge branch 'master' of git://git.bogomips.org/git-svn	blob \| diff \| raw
2016-07-28	Merge branch 'nd/icase' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'sb/submodule-parallel-fetch' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'js/am-call-theirs-theirs-in-fallback...	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'js/t3404-grammo-fix' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'nd/doc-new-command' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'ew/gc-auto-pack-limit-fix' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'js/color-on-windows-comment' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'mm/doc-tt' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'js/sign-empty-commit-fix' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'ps/rebase-i-auto-unstash-upon-abort'...	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'nd/ita-cleanup' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'js/find-commit-subject-ignore-leading...	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'dg/subtree-rebase-test' into maint	blob \| diff \| raw \| diff to current
2016-07-28	Merge branch 'sb/submodule-deinit-all'	blob \| diff \| raw
2016-07-28	Merge branch 'ew/find-perl-on-freebsd-in-local'	blob \| diff \| raw
2016-07-28	Merge branch 'ew/daemon-socket-keepalive'	blob \| diff \| raw
2016-07-28	Merge branch 'nd/pack-ofs-4gb-limit'	blob \| diff \| raw
2016-07-28	Merge branch 'nd/worktree-lock'	blob \| diff \| raw
2016-07-28	Merge branch 'rs/notes-merge-no-toctou'	blob \| diff \| raw
2016-07-28	Merge branch 'js/rebase-i-tests'	blob \| diff \| raw
2016-07-25	Merge branch 'rs/use-strbuf-addbuf'	blob \| diff \| raw
2016-07-25	Merge branch 'ew/autoconf-pthread'	blob \| diff \| raw
2016-07-25	Merge branch 'mh/blame-worktree'	blob \| diff \| raw
2016-07-25	Merge branch 'js/fsck-name-object'	blob \| diff \| raw
2016-07-25	Merge branch 'nd/cache-tree-ita'	blob \| diff \| raw
2016-07-25	Merge branch 'jk/push-scrub-url'	blob \| diff \| raw
2016-07-25	Merge branch 'nd/test-helpers'	blob \| diff \| raw
2016-07-25	Merge branch 'jc/doc-diff-filter-exclude'	blob \| diff \| raw
2016-07-25	Merge branch 'ls/travis-enable-httpd-tests'	blob \| diff \| raw
2016-07-25	Merge branch 'jc/renormalize-merge-kill-safer-crlf'	blob \| diff \| raw
2016-07-25	Merge branch 'rs/worktree-use-strbuf-absolute-path'	blob \| diff \| raw \| diff to current
2016-07-25	Merge branch 'rs/rm-strbuf-optim'	blob \| diff \| raw \| diff to current
2016-07-25	Merge branch 'rw/make-needs-librt'	blob \| diff \| raw \| diff to current
2016-07-25	Merge branch 'js/ignore-space-at-eol'	blob \| diff \| raw \| diff to current
2016-07-25	Merge branch 'mh/ref-iterators'	blob \| diff \| raw \| diff to current
2016-07-25	Merge branch 'mh/update-ref-errors'	blob \| diff \| raw \| diff to current
2016-07-25	Merge branch 'mh/split-under-lock'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'ls/p4-tmp-refs'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'js/am-call-theirs-theirs-in-fallback...	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'jk/write-file'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'jk/printf-format'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'rs/help-c-source-with-gitattributes'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'nd/fetch-ref-summary'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'jk/test-match-signal'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'jk/common-main'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'ak/lazy-prereq-mktemp'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'nd/icase'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'bc/cocci'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'sb/submodule-parallel-fetch'	blob \| diff \| raw \| diff to current
2016-07-19	Merge branch 'lf/recv-sideband-cleanup'	blob \| diff \| raw \| diff to current
2016-07-15	Merge branch 'jk/tzoffset-fix' into maint	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'nd/ita-cleanup'	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'ps/rebase-i-auto-unstash-upon-abort'	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'js/t3404-grammo-fix'	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'js/sign-empty-commit-fix'	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'mm/doc-tt'	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'dg/subtree-rebase-test'	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'nd/doc-new-command'	blob \| diff \| raw \| diff to current
2016-07-13	Merge branch 'ew/gc-auto-pack-limit-fix'	blob \| diff \| raw \| diff to current
2016-07-12	merge: avoid "safer crlf" during recording of merge...	blob \| diff \| raw \| diff to current
2016-07-11	Merge branch 'jc/t2300-setup' into maint	blob \| diff \| raw \| diff to current
2016-07-11	Merge branch 'cb/t7810-test-label-fix' into maint	blob \| diff \| raw \| diff to current
2016-07-11	Merge branch 'sb/t5614-modernize' into maint	blob \| diff \| raw \| diff to current
2016-07-11	Merge branch 'jn/preformatted-doc-url' into maint	blob \| diff \| raw \| diff to current
next