Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2013-03-26	Merge branch 'jk/utf-8-can-be-spelled-differently'...	blob \| diff \| raw
2013-03-26	Merge branch 'nd/branch-error-cases' into maint	blob \| diff \| raw
2013-03-26	Merge branch 'ap/maint-update-index-h-is-for-help'...	blob \| diff \| raw
2013-03-26	Merge branch 'jc/perl-cat-blob' into maint	blob \| diff \| raw
2013-03-26	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw
2013-03-26	Merge branch 'nd/index-pack-l10n-buf-overflow' into...	blob \| diff \| raw
2013-03-26	Merge branch 'jc/maint-push-refspec-default-doc' into...	blob \| diff \| raw
2013-03-26	Merge branch 'gp/avoid-explicit-mention-of-dot-git...	blob \| diff \| raw
2013-03-26	Merge branch 'jc/maint-reflog-expire-clean-mark-typofix...	blob \| diff \| raw
2013-03-25	Merge branch 'jk/fully-peeled-packed-ref'	blob \| diff \| raw
2013-03-25	Merge branch 'jk/fast-export-object-lookup'	blob \| diff \| raw
2013-03-25	Merge branch 'jk/peel-ref'	blob \| diff \| raw
2013-03-25	Merge branch 'lf/setup-prefix-pathspec'	blob \| diff \| raw
2013-03-25	Merge branch 'ph/tag-force-no-warn-on-creation'	blob \| diff \| raw
2013-03-25	Merge branch 'jk/suppress-clang-warning'	blob \| diff \| raw
2013-03-25	Merge branch 'jk/empty-archive'	blob \| diff \| raw
2013-03-25	Merge branch 'ks/rfc2047-one-char-at-a-time'	blob \| diff \| raw
2013-03-25	Merge branch 'jk/alias-in-bare'	blob \| diff \| raw
2013-03-25	Merge branch 'jc/push-follow-tag'	blob \| diff \| raw
2013-03-25	Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'	blob \| diff \| raw
2013-03-25	Merge branch 'ap/maint-diff-rename-avoid-overlap'	blob \| diff \| raw
2013-03-25	Merge branch 'jl/submodule-deinit'	blob \| diff \| raw
2013-03-25	Merge branch 'jc/describe'	blob \| diff \| raw
2013-03-25	Merge branch 'pe/pull-rebase-v-q'	blob \| diff \| raw
2013-03-25	Merge branch 'maint-1.8.1' into maint	blob \| diff \| raw
2013-03-25	Merge branch 'lf/bundle-verify-list-prereqs' into maint...	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'tk/doc-filter-branch' into maint-1.8.1	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'dm/ni-maxhost-may-be-missing' into maint...	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'jc/color-diff-doc' into maint-1.8.1	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'we/submodule-update-prefix-output'	blob \| diff \| raw
2013-03-21	Merge branch 'rs/zip-compresssed-size-with-export-subst'	blob \| diff \| raw
2013-03-21	Merge branch 'mn/send-email-works-with-credential'	blob \| diff \| raw
2013-03-21	Merge branch 'tz/credential-authinfo'	blob \| diff \| raw
2013-03-21	Merge branch 'jk/utf-8-can-be-spelled-differently'	blob \| diff \| raw
2013-03-21	Merge branch 'mg/gpg-interface-using-status'	blob \| diff \| raw
2013-03-21	Merge branch 'rt/commit-cleanup-config'	blob \| diff \| raw
2013-03-21	Merge branch 'nd/branch-error-cases'	blob \| diff \| raw
2013-03-21	Merge branch 'ap/maint-update-index-h-is-for-help'	blob \| diff \| raw
2013-03-21	Merge branch 'jc/perl-cat-blob'	blob \| diff \| raw
2013-03-21	Merge branch 'da/difftool-fixes'	blob \| diff \| raw
2013-03-21	Merge branch 'ob/imap-send-ssl-verify'	blob \| diff \| raw
2013-03-21	Merge branch 'nd/count-garbage'	blob \| diff \| raw
2013-03-21	Merge branch 'jc/fetch-raw-sha1'	blob \| diff \| raw
2013-03-21	Merge branch 'nd/preallocate-hash'	blob \| diff \| raw
2013-03-21	Merge branch 'nd/index-pack-l10n-buf-overflow'	blob \| diff \| raw
2013-03-21	Merge branch 'tb/document-status-u-tradeoff'	blob \| diff \| raw
2013-03-21	Merge branch 'jn/shell-disable-interactive'	blob \| diff \| raw
2013-03-21	Merge branch 'jc/maint-push-refspec-default-doc'	blob \| diff \| raw
2013-03-19	Merge branch 'lf/bundle-verify-list-prereqs'	blob \| diff \| raw
2013-03-19	Merge branch 'tk/doc-filter-branch'	blob \| diff \| raw
2013-03-19	Merge branch 'dm/ni-maxhost-may-be-missing'	blob \| diff \| raw
2013-03-19	Merge branch 'gp/describe-match-uses-glob-pattern'	blob \| diff \| raw
2013-03-19	Merge branch 'gp/avoid-explicit-mention-of-dot-git...	blob \| diff \| raw
2013-03-19	Merge branch 'nd/doc-index-format'	blob \| diff \| raw
2013-03-19	Merge branch 'wk/doc-pre-rebase'	blob \| diff \| raw
2013-03-19	Merge branch 'jc/color-diff-doc'	blob \| diff \| raw
2013-03-17	Merge branch 'maint'	blob \| diff \| raw
2013-03-17	Merge branch 'maint'	blob \| diff \| raw
2013-03-13	Merge branch 'jc/reflog-reverse-walk' into nd/branch...	blob \| diff \| raw \| diff to current
2013-03-11	Merge branch 'maint'	blob \| diff \| raw
2013-03-11	Merge branch 'mp/complete-paths'	blob \| diff \| raw
2013-03-11	Merge branch 'maint'	blob \| diff \| raw
2013-03-09	Merge branch 'maint'	blob \| diff \| raw
2013-03-07	Merge branch 'mp/complete-paths'	blob \| diff \| raw
2013-03-07	Merge branch 'maint'	blob \| diff \| raw
2013-03-07	Merge branch 'mh/maint-ceil-absolute' into maint	blob \| diff \| raw \| diff to current
2013-03-01	Sync with 1.8.1.5	blob \| diff \| raw
2013-02-27	Merge branch 'maint'	blob \| diff \| raw
2013-02-27	Merge branch 'wk/man-deny-current-branch-is-default...	blob \| diff \| raw \| diff to current
2013-02-27	Merge branch 'jn/less-reconfigure' into maint	blob \| diff \| raw \| diff to current
2013-02-27	Merge branch 'mh/maint-ceil-absolute'	blob \| diff \| raw
2013-02-25	Sync with 'maint'	blob \| diff \| raw
2013-02-25	Merge branch 'wk/user-manual'	blob \| diff \| raw
2013-02-25	Merge branch 'jn/less-reconfigure'	blob \| diff \| raw
2013-02-25	Merge branch 'as/check-ignore'	blob \| diff \| raw
2013-02-25	Merge branch 'ct/autoconf-htmldir'	blob \| diff \| raw
2013-02-25	Merge branch 'wk/man-deny-current-branch-is-default...	blob \| diff \| raw
2013-02-25	Merge branch 'jc/mention-tracking-for-pull-default...	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'da/p4merge-mktemp-fix' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'al/mergetool-printf-fix' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'jx/utf8-printf-width' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'mg/bisect-doc' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'sp/smart-http-content-type-check' into...	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'jc/combine-diff-many-parents' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'jk/apply-similaritly-parsing' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'jk/remote-helpers-doc' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'ab/gitweb-use-same-scheme' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'zk/clean-report-failure' into maint	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'nd/clone-no-separate-git-dir-with-bare...	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'da/p4merge-mktemp' into maint	blob \| diff \| raw \| diff to current
2013-02-20	Sync with v1.8.1.4	blob \| diff \| raw
2013-02-20	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw \| diff to current
2013-02-19	Merge branch 'jc/mention-tracking-for-pull-default'	blob \| diff \| raw
2013-02-19	Merge branch 'mm/config-intro-in-git-doc'	blob \| diff \| raw
2013-02-18	Merge branch 'maint'	blob \| diff \| raw
2013-02-18	Merge git://github.com/git-l10n/git-po	blob \| diff \| raw
2013-02-17	Merge branch 'jc/hidden-refs'	blob \| diff \| raw
2013-02-17	Merge branch 'mp/diff-algo-config'	blob \| diff \| raw
2013-02-17	Merge branch 'jk/rebase-i-comment-char'	blob \| diff \| raw \| diff to current
2013-02-15	Merge branch 'wk/man-deny-current-branch-is-default...	blob \| diff \| raw \| diff to current
next