Andrew's git - gitweb.git/history

[gitweb.git] / merge.c

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-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-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 '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-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-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 '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-07	Merge branch 'mh/maint-ceil-absolute' into maint	blob \| diff \| raw
2013-02-27	Merge branch 'wk/man-deny-current-branch-is-default...	blob \| diff \| raw
2013-02-27	Merge branch 'jn/less-reconfigure' into maint	blob \| diff \| raw
2013-02-27	Merge branch 'mh/maint-ceil-absolute'	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
2013-02-25	Merge branch 'al/mergetool-printf-fix' into maint	blob \| diff \| raw
2013-02-25	Merge branch 'mg/bisect-doc' into maint	blob \| diff \| raw
2013-02-25	Merge branch 'jc/combine-diff-many-parents' into maint	blob \| diff \| raw
2013-02-25	Merge branch 'jk/apply-similaritly-parsing' into maint	blob \| diff \| raw
2013-02-25	Merge branch 'zk/clean-report-failure' into maint	blob \| diff \| raw
2013-02-25	Merge branch 'nd/clone-no-separate-git-dir-with-bare...	blob \| diff \| raw
2013-02-20	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw
2013-02-19	Merge branch 'jc/mention-tracking-for-pull-default'	blob \| diff \| raw
2013-02-15	Merge branch 'wk/man-deny-current-branch-is-default...	blob \| diff \| raw
2013-02-14	Merge branch 'al/mergetool-printf-fix'	blob \| diff \| raw
2013-02-14	Merge branch 'mg/bisect-doc'	blob \| diff \| raw
2013-02-14	Merge branch 'jc/extended-fake-ancestor-for-gitlink'	blob \| diff \| raw
2013-02-08	Merge branch 'jc/combine-diff-many-parents'	blob \| diff \| raw
2013-02-08	Merge branch 'jk/apply-similaritly-parsing'	blob \| diff \| raw
2013-02-08	Merge branch 'ct/autoconf-htmldir'	blob \| diff \| raw
2013-02-07	Merge branch 'ft/transport-report-segv' into maint	blob \| diff \| raw
2013-02-07	Merge branch 'sb/gpg-plug-fd-leak' into maint	blob \| diff \| raw
2013-02-07	Merge branch 'jc/fake-ancestor-with-non-blobs' into...	blob \| diff \| raw
2013-02-07	Merge branch 'jn/auto-depend-workaround-buggy-ccache...	blob \| diff \| raw
2013-02-07	Merge branch 'da/mergetool-docs'	blob \| diff \| raw
2013-02-07	Merge branch 'jk/mergetool'	blob \| diff \| raw
2013-02-07	Merge branch 'sb/run-command-fd-error-reporting'	blob \| diff \| raw
2013-02-06	Merge branch 'jn/auto-depend-workaround-buggy-ccache'	blob \| diff \| raw
2013-02-06	Merge branch 'jc/fake-ancestor-with-non-blobs'	blob \| diff \| raw
2013-02-06	Merge branch 'sb/gpg-plug-fd-leak'	blob \| diff \| raw
2013-02-06	Merge branch 'ft/transport-report-segv'	blob \| diff \| raw
2013-02-04	Merge branch 'nd/edit-branch-desc-while-detached' into...	blob \| diff \| raw
2013-02-04	Merge branch 'jn/do-not-drop-username-when-reading...	blob \| diff \| raw
2013-02-04	Merge branch 'dl/am-hg-locale' into maint	blob \| diff \| raw
2013-02-04	Merge branch 'jc/doc-maintainer' into maint	blob \| diff \| raw
2013-02-01	Merge branch 'nd/edit-branch-desc-while-detached'	blob \| diff \| raw
2013-02-01	Merge branch 'jn/do-not-drop-username-when-reading...	blob \| diff \| raw
2013-02-01	Merge branch 'jc/no-git-config-in-clone'	blob \| diff \| raw
2013-02-01	Merge branch 'nd/fetch-depth-is-broken'	blob \| diff \| raw
2013-01-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw
2013-01-30	Merge branch 'nd/edit-branch-desc-while-detached' into...	blob \| diff \| raw
2013-01-30	Merge branch 'tb/t0050-maint' into maint	blob \| diff \| raw
2013-01-29	Merge branch 'ph/rebase-preserve-all-merges' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'ss/help-htmlpath-config-doc' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'nd/attr-debug-fix' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'ds/completion-silence-in-tree-path-probe...	blob \| diff \| raw
2013-01-28	Merge branch 'jn/maint-trim-vim-contrib' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'pe/doc-email-env-is-trumped-by-config...	blob \| diff \| raw
2013-01-28	Merge branch 'ap/status-ignored-in-ignored-directory...	blob \| diff \| raw
2013-01-28	Merge branch 'er/stop-recommending-parsecvs' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'mh/ceiling' into maint	blob \| diff \| raw
2013-01-28	Merge branch 'tb/t0050-maint'	blob \| diff \| raw
2013-01-28	Merge branch 'dl/am-hg-locale'	blob \| diff \| raw
2013-01-27	Merge branch 'jk/maint-gc-auto-after-fetch' into jk...	blob \| diff \| raw
2013-01-25	Merge branch 'nd/retire-fnmatch'	blob \| diff \| raw
2013-01-25	Merge branch 'jc/doc-maintainer'	blob \| diff \| raw
2013-01-24	Merge branch 'ch/add-auto-submitted-in-sample-post...	blob \| diff \| raw
2013-01-24	Merge branch 'as/check-ignore'	blob \| diff \| raw
2013-01-24	Merge branch 'rs/clarify-entry-cmp-sslice'	blob \| diff \| raw
2013-01-24	Merge branch 'mo/cvs-server-updates'	blob \| diff \| raw
next