Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.h

2013-08-05	Merge branch 'dn/test-reject-utf-16'	blob \| diff \| raw
2013-07-31	Merge branch 'jk/commit-how-to-abort-cherry-pick'	blob \| diff \| raw
2013-07-31	Merge branch 'ds/doc-two-kinds-of-tags'	blob \| diff \| raw
2013-07-30	Merge branch 'jk/capabilities-doc'	blob \| diff \| raw
2013-07-22	Merge branch 'jk/t0008-sigpipe-fix'	blob \| diff \| raw
2013-07-22	Merge branch 'sb/parse-object-buffer-eaten'	blob \| diff \| raw
2013-07-22	Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...	blob \| diff \| raw
2013-07-22	Merge branch 'mh/maint-lockfile-overflow' into maint	blob \| diff \| raw
2013-07-22	Merge branch 'jc/maint-diff-core-safecrlf' into maint	blob \| diff \| raw
2013-07-19	Merge branch 'jc/t1512-fix' into maint	blob \| diff \| raw
2013-07-15	Merge branch 'tr/maint-apply-non-git-patch-parsefix...	blob \| diff \| raw
2013-07-12	Merge branch 'rs/pickaxe-simplify'	blob \| diff \| raw
2013-07-11	Merge branch 'jc/t1512-fix'	blob \| diff \| raw
2013-07-11	Merge branch 'jc/maint-diff-core-safecrlf'	blob \| diff \| raw
2013-07-11	Merge branch 'mh/maint-lockfile-overflow'	blob \| diff \| raw
2013-07-03	Merge branch 'cr/git-work-tree-sans-git-dir' into maint	blob \| diff \| raw
2013-07-03	Merge branch 'fc/do-not-use-the-index-in-add-to-index...	blob \| diff \| raw
2013-06-27	Merge branch 'mk/combine-diff-context-horizon-fix'...	blob \| diff \| raw
2013-06-26	Merge branch 'tr/maint-apply-non-git-patch-parsefix'	blob \| diff \| raw
2013-06-17	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| diff \| raw
2013-06-11	Merge branch 'rr/maint-fetch-tag-doc-asterisks'	blob \| diff \| raw
2013-06-11	Merge branch 'cr/git-work-tree-sans-git-dir'	blob \| diff \| raw
2013-06-11	Merge branch 'fc/do-not-use-the-index-in-add-to-index'	blob \| diff \| raw
2013-06-02	Merge branch 'mk/combine-diff-context-horizon-fix'	blob \| diff \| raw
2013-05-29	Merge branch 'jk/lookup-object-prefer-latest'	blob \| diff \| raw
2013-05-29	Merge branch 'as/check-ignore'	blob \| diff \| raw
2013-05-17	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2013-05-13	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2013-05-09	Merge branch 'tr/copy-revisions-from-stdin' into maint	blob \| diff \| raw
2013-05-01	Merge branch 'hb/git-pm-tempfile'	blob \| diff \| raw
2013-04-26	Merge branch 'ph/rebase-original'	blob \| diff \| raw
2013-04-24	Merge branch 'sr/log-SG-no-textconv' into maint	blob \| diff \| raw
2013-04-24	Merge branch 'jc/merge-tag-object' into maint	blob \| diff \| raw
2013-04-22	Merge branch 'jc/detached-head-doc' into maint	blob \| diff \| raw
2013-04-22	Merge branch 'jk/show-branch-strbuf' into maint	blob \| diff \| raw
2013-04-22	Merge branch 'js/rerere-forget-protect-against-NUL...	blob \| diff \| raw
2013-04-22	Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint	blob \| diff \| raw
2013-04-22	Merge branch 'jk/filter-branch-come-back-to-original...	blob \| diff \| raw
2013-04-19	Merge branch 'tr/copy-revisions-from-stdin'	blob \| diff \| raw
2013-04-18	Merge branch 'jc/detached-head-doc'	blob \| diff \| raw
2013-04-15	Merge branch 'jk/show-branch-strbuf'	blob \| diff \| raw
2013-04-12	Merge branch 'jk/diffcore-break-divzero' into maint	blob \| diff \| raw
2013-04-12	Merge branch 'cn/commit-amend-doc' into maint	blob \| diff \| raw
2013-04-12	Merge branch 'jk/bisect-prn-unsigned' into maint	blob \| diff \| raw
2013-04-12	Merge branch 'tb/document-status-u-tradeoff' into maint	blob \| diff \| raw
2013-04-12	Merge branch 'sr/log-SG-no-textconv'	blob \| diff \| raw
2013-04-12	Merge branch 'js/rerere-forget-protect-against-NUL'	blob \| diff \| raw
2013-04-07	Merge branch 'cn/commit-amend-doc'	blob \| diff \| raw
2013-04-07	Merge branch 'jk/diffcore-break-divzero'	blob \| diff \| raw
2013-04-07	Merge branch 'jk/bisect-prn-unsigned'	blob \| diff \| raw
2013-04-07	Merge branch 'jk/filter-branch-come-back-to-original'	blob \| diff \| raw
2013-04-05	Merge branch 'jc/merge-tag-object'	blob \| diff \| raw
2013-04-04	Merge branch 'nd/index-pack-threaded-fixes' into maint	blob \| diff \| raw
2013-04-04	Merge branch 'jk/index-pack-correct-depth-fix' into...	blob \| diff \| raw
2013-04-04	Merge branch 'jk/peel-ref' into maint	blob \| diff \| raw
2013-04-03	Merge branch 'jc/apply-ws-fix-tab-in-indent'	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 '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 '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 'sw/safe-create-leading-dir-race'	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 'tb/document-status-u-tradeoff' 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 'jc/remove-export-from-config-mak-in'	blob \| diff \| raw
2013-04-01	Merge branch 'kb/name-hash'	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 'jc/remove-treesame-parent-in-simplify...	blob \| diff \| raw
2013-03-28	Merge branch 'jk/checkout-attribute-lookup'	blob \| diff \| raw
2013-03-26	Merge branch 'jc/reflog-reverse-walk'	blob \| diff \| raw
2013-03-26	Merge branch 'jk/utf-8-can-be-spelled-differently'...	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-25	Merge branch 'jk/fully-peeled-packed-ref'	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 'ks/rfc2047-one-char-at-a-time'	blob \| diff \| raw
2013-03-25	Merge branch 'ap/maint-diff-rename-avoid-overlap'	blob \| diff \| raw
2013-03-25	Merge branch 'lf/bundle-verify-list-prereqs' into maint...	blob \| diff \| raw
2013-03-25	Merge branch 'tk/doc-filter-branch' into maint-1.8.1	blob \| diff \| raw
2013-03-25	Merge branch 'dm/ni-maxhost-may-be-missing' into maint...	blob \| diff \| raw
2013-03-25	Merge branch 'jc/color-diff-doc' into maint-1.8.1	blob \| diff \| raw
2013-03-21	Merge branch 'jk/utf-8-can-be-spelled-differently'	blob \| diff \| raw
2013-03-21	Merge branch 'jc/perl-cat-blob'	blob \| diff \| raw
2013-03-21	Merge branch 'ob/imap-send-ssl-verify'	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 'jc/maint-push-refspec-default-doc'	blob \| diff \| raw
2013-03-19	Merge branch 'lf/bundle-verify-list-prereqs'	blob \| diff \| raw
next