Andrew's git - gitweb.git/history - builtin/merge-tree.c

[gitweb.git] / builtin / merge-tree.c

2013-04-03	Merge branch 'jk/check-corrupt-objects-carefully'	blob \| diff \| raw
2013-04-03	Merge branch 'jc/apply-ws-fix-tab-in-indent'	blob \| diff \| raw
2013-04-03	Merge branch 'jc/directory-attrs-regression-fix'	blob \| diff \| raw
2013-04-03	Merge branch 'nd/checkout-paths-reduce-match-pathspec...	blob \| diff \| raw
2013-04-03	Merge branch 'mg/gpg-interface-using-status' into maint	blob \| diff \| raw
2013-04-03	Merge branch 'bc/commit-complete-lines-given-via-m...	blob \| diff \| raw
2013-04-03	Merge branch 'jc/describe' into maint	blob \| diff \| raw
2013-04-03	Merge branch 'jk/alias-in-bare' into maint	blob \| diff \| raw
2013-04-03	Merge branch 'ks/rfc2047-one-char-at-a-time' into maint	blob \| diff \| raw
2013-04-03	Merge branch 'jk/empty-archive' into maint	blob \| diff \| raw
2013-04-03	Merge branch 'ph/tag-force-no-warn-on-creation' into...	blob \| diff \| raw
2013-04-03	Merge branch 'lf/setup-prefix-pathspec' into maint	blob \| diff \| raw
2013-04-03	Merge branch 'kb/name-hash' into maint-1.8.1	blob \| diff \| raw
2013-04-03	Merge branch 'kk/revwalk-slop-too-many-commit-within...	blob \| diff \| raw
2013-04-03	Merge branch 'jk/checkout-attribute-lookup' into maint...	blob \| diff \| raw
2013-04-03	Merge branch 'jk/fully-peeled-packed-ref' into maint...	blob \| diff \| raw
2013-04-03	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| diff \| raw
2013-04-03	Merge branch 'yd/doc-merge-annotated-tag' into maint...	blob \| diff \| raw
2013-04-03	Merge branch 'ap/maint-update-index-h-is-for-help'...	blob \| diff \| raw
2013-04-03	Merge branch 'jc/perl-cat-blob' into maint-1.8.1	blob \| diff \| raw
2013-04-03	Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1	blob \| diff \| raw
2013-04-03	Merge branch 'nd/index-pack-l10n-buf-overflow' into...	blob \| diff \| raw
2013-04-02	Merge branch 'js/log-gpg'	blob \| diff \| raw
2013-04-02	Merge branch 'tb/cygwin-shared-repository'	blob \| diff \| raw
2013-04-02	Merge branch 'sw/safe-create-leading-dir-race'	blob \| diff \| raw
2013-04-02	Merge branch 'bk/document-commit-tree-S'	blob \| diff \| raw
2013-04-02	Merge branch 'jk/no-more-self-assignment'	blob \| diff \| raw
2013-04-01	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| diff \| raw
2013-04-01	Merge branch 'rr/tests-dedup-test-config' into maint	blob \| diff \| raw
2013-04-01	Merge branch 'yd/doc-is-in-asciidoc' into maint	blob \| diff \| raw
2013-04-01	Merge branch 'yd/doc-merge-annotated-tag' into maint	blob \| diff \| raw
2013-04-01	Merge branch 'tb/document-status-u-tradeoff' into maint	blob \| diff \| raw
2013-04-01	Merge branch 'da/downcase-u-in-usage' into maint	blob \| diff \| raw
2013-04-01	Merge branch 'nd/index-pack-threaded-fixes'	blob \| diff \| raw
2013-04-01	Merge branch 'jk/index-pack-correct-depth-fix'	blob \| diff \| raw
2013-04-01	Merge branch 'jn/push-tests'	blob \| diff \| raw
2013-04-01	Merge branch 'nd/branch-show-rebase-bisect-state'	blob \| diff \| raw
2013-04-01	Merge branch 'jc/nobody-sets-src-peer-ref'	blob \| diff \| raw
2013-04-01	Merge branch 'jc/remove-export-from-config-mak-in'	blob \| diff \| raw
2013-04-01	Merge branch 'kb/name-hash'	blob \| diff \| raw
2013-04-01	Merge branch 'jk/common-make-variables-export-safety'	blob \| diff \| raw
2013-04-01	Merge branch 'jk/pkt-line-cleanup'	blob \| diff \| raw
2013-04-01	Merge branch 'bc/append-signed-off-by'	blob \| diff \| raw
2013-04-01	Merge branch 'sr/am-show-final-message-in-applying...	blob \| diff \| raw
2013-04-01	Merge branch 'rr/test-3200-style'	blob \| diff \| raw
2013-03-28	Merge branch 'yd/use-test-config-unconfig'	blob \| diff \| raw
2013-03-28	Merge branch 'kk/revwalk-slop-too-many-commit-within...	blob \| diff \| raw
2013-03-28	Merge branch 'rr/tests-dedup-test-config'	blob \| diff \| raw
2013-03-28	Merge branch 'yd/doc-is-in-asciidoc'	blob \| diff \| raw
2013-03-28	Merge branch 'yd/doc-merge-annotated-tag'	blob \| diff \| raw
2013-03-28	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| diff \| raw
2013-03-28	Merge branch 'jk/checkout-attribute-lookup'	blob \| diff \| raw
2013-03-28	Merge branch 'jk/difftool-dir-diff-edit-fix'	blob \| diff \| raw
2013-03-27	Merge branch 'maint'	blob \| diff \| raw
2013-03-27	Merge branch 'maint-1.8.1' into maint	blob \| diff \| raw
2013-03-27	merge-tree: fix typo in merge-tree.c::unresolved	blob \| diff \| raw
2013-03-26	Merge branch 'jc/reflog-reverse-walk'	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'jk/utf-8-can-be-spelled-differently'...	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'jc/perl-cat-blob' into maint	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'nd/index-pack-l10n-buf-overflow' into...	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'jc/maint-push-refspec-default-doc' into...	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'jk/fully-peeled-packed-ref'	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'jk/peel-ref'	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'lf/setup-prefix-pathspec'	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'jk/suppress-clang-warning'	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'ks/rfc2047-one-char-at-a-time'	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'ap/maint-diff-rename-avoid-overlap'	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'jl/submodule-deinit'	blob \| diff \| raw \| diff to current
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 'tz/credential-authinfo'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'jk/utf-8-can-be-spelled-differently'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'rt/commit-cleanup-config'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'jc/perl-cat-blob'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'ob/imap-send-ssl-verify'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'nd/index-pack-l10n-buf-overflow'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'tb/document-status-u-tradeoff'	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'jc/maint-push-refspec-default-doc'	blob \| diff \| raw \| diff to current
2013-03-19	Merge branch 'lf/bundle-verify-list-prereqs'	blob \| diff \| raw \| diff to current
2013-03-19	Merge branch 'tk/doc-filter-branch'	blob \| diff \| raw \| diff to current
2013-03-19	Merge branch 'dm/ni-maxhost-may-be-missing'	blob \| diff \| raw \| diff to current
2013-03-19	Merge branch 'jc/color-diff-doc'	blob \| diff \| raw \| diff to current
2013-03-13	Merge branch 'jc/reflog-reverse-walk' into nd/branch...	blob \| diff \| raw \| diff to current
2013-03-11	Merge branch 'mp/complete-paths'	blob \| diff \| raw \| diff to current
2013-03-07	Merge branch 'mp/complete-paths'	blob \| diff \| raw \| diff to current
2013-03-07	Merge branch 'mh/maint-ceil-absolute' into maint	blob \| diff \| raw \| diff to current
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 \| diff to current
2013-02-25	Merge branch 'jn/less-reconfigure'	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'as/check-ignore'	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'ct/autoconf-htmldir'	blob \| diff \| raw \| diff to current
2013-02-25	Merge branch 'wk/man-deny-current-branch-is-default...	blob \| diff \| raw \| diff to current
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
next