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

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

2013-05-01	Merge branch 'rs/pp-user-info-without-extra-allocation'	blob \| diff \| raw
2013-05-01	Merge branch 'tr/remote-tighten-commandline-parsing'	blob \| diff \| raw
2013-05-01	Merge branch 'zk/prompt-rebase-step'	blob \| diff \| raw
2013-04-29	Merge branch 'maint'	blob \| diff \| raw
2013-04-28	Merge branch 'maint'	blob \| diff \| raw
2013-04-28	Merge branch 'nd/pretty-formats'	blob \| diff \| raw
2013-04-28	Merge branch 'jk/check-corrupt-objects-carefully'	blob \| diff \| raw
2013-04-28	Merge branch 'jk/merge-tree-added-identically'	blob \| diff \| raw
2013-04-28	merge-tree: fix typo in "both changed identically"	blob \| diff \| raw
2013-04-26	Merge branch 'rr/shortlog-doc'	blob \| diff \| raw \| diff to current
2013-04-26	Merge branch 'ph/rebase-original'	blob \| diff \| raw \| diff to current
2013-04-26	Merge branch 'jn/glossary-revision'	blob \| diff \| raw \| diff to current
2013-04-26	Merge branch 'fc/remote-bzr'	blob \| diff \| raw \| diff to current
2013-04-26	Sync with 1.8.2.2	blob \| diff \| raw \| diff to current
2013-04-26	Merge branch 'rt/commentchar-fmt-merge-msg' into maint	blob \| diff \| raw \| diff to current
2013-04-26	Merge branch 'rs/empty-archive' into maint	blob \| diff \| raw \| diff to current
2013-04-26	Merge branch 'pe/pull-rebase-v-q' into maint	blob \| diff \| raw \| diff to current
2013-04-24	Merge branch 'jk/remote-helper-with-signed-tags'	blob \| diff \| raw \| diff to current
2013-04-24	Sync with maint	blob \| diff \| raw \| diff to current
2013-04-24	Merge branch 'jk/diff-algo-finishing-touches' into...	blob \| diff \| raw \| diff to current
2013-04-24	Merge branch 'sr/log-SG-no-textconv' into maint	blob \| diff \| raw \| diff to current
2013-04-24	Merge branch 'jc/merge-tag-object' into maint	blob \| diff \| raw \| diff to current
2013-04-24	Merge git://github.com/git-l10n/git-po	blob \| diff \| raw \| diff to current
2013-04-23	Merge branch 'kb/status-ignored-optim-2'	blob \| diff \| raw \| diff to current
2013-04-23	Merge branch 'jn/gitweb-install-doc'	blob \| diff \| raw \| diff to current
2013-04-23	Merge branch 'fc/untracked-zsh-prompt'	blob \| diff \| raw \| diff to current
2013-04-23	Merge branch 'jk/receive-pack-deadlocks-with-early...	blob \| diff \| raw \| diff to current
2013-04-22	Sync with maint	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jc/detached-head-doc' into maint	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jk/show-branch-strbuf' into maint	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'js/rerere-forget-protect-against-NUL...	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'ap/combine-diff-ignore-whitespace' into...	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jk/suppress-clang-warning' into maint	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jk/filter-branch-come-back-to-original...	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'as/clone-reference-with-gitfile'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jc/add-2.0-delete-default' (early part)	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'nd/checkout-keep-sparse'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jk/chopped-ident'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'th/bisect-final-log'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'rs/archive-zip-raw-compression'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'ta/glossary'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jk/doc-http-backend'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'jx/i18n-branch-error-messages'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'fc/remote-hg'	blob \| diff \| raw \| diff to current
2013-04-22	Merge branch 'lf/read-blob-data-from-index'	blob \| diff \| raw \| diff to current
2013-04-19	Merge branch 'jk/a-thread-only-dies-once'	blob \| diff \| raw \| diff to current
2013-04-19	Merge branch 'rt/commentchar-fmt-merge-msg'	blob \| diff \| raw \| diff to current
2013-04-19	Merge branch 'mv/sequencer-pick-error-diag'	blob \| diff \| raw \| diff to current
2013-04-19	Merge branch 'tr/copy-revisions-from-stdin'	blob \| diff \| raw \| diff to current
2013-04-19	Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early...	blob \| diff \| raw \| diff to current
2013-04-19	Merge branch 'ap/strbuf-humanize'	blob \| diff \| raw \| diff to current
2013-04-19	Merge branch 'fc/branch-upstream-color'	blob \| diff \| raw \| diff to current
2013-04-19	Merge branch 'mv/ssl-ftp-curl'	blob \| diff \| raw \| diff to current
2013-04-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2013-04-18	Merge branch 'jk/test-trash'	blob \| diff \| raw \| diff to current
2013-04-18	Merge branch 'th/t9903-symlinked-workdir'	blob \| diff \| raw \| diff to current
2013-04-18	Merge branch 'jk/merge-tree-added-identically'	blob \| diff \| raw \| diff to current
2013-04-18	Merge branch 'rs/empty-archive'	blob \| diff \| raw \| diff to current
2013-04-18	Merge branch 'jc/push-2.0-default-to-simple' (early...	blob \| diff \| raw \| diff to current
2013-04-18	Merge branch 'jc/detached-head-doc'	blob \| diff \| raw \| diff to current
2013-04-18	Merge branch 'tr/packed-object-info-wo-recursion'	blob \| diff \| raw \| diff to current
2013-04-15	Merge branch 'jk/diff-algo-finishing-touches'	blob \| diff \| raw \| diff to current
2013-04-15	Merge branch 'rt/commentchar-fmt-merge-msg'	blob \| diff \| raw \| diff to current
2013-04-15	Merge branch 'jk/show-branch-strbuf'	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'rr/test-3200-style' into maint	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'jk/diffcore-break-divzero' into maint	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'cn/commit-amend-doc' into maint	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'jk/bisect-prn-unsigned' into maint	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'jk/no-more-self-assignment' into maint	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'tb/document-status-u-tradeoff' into maint	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'ap/combine-diff-coalesce-lost'	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'sr/log-SG-no-textconv'	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'js/rerere-forget-protect-against-NUL'	blob \| diff \| raw \| diff to current
2013-04-08	merge-tree: don't print entries that match "local"	blob \| diff \| raw \| diff to current
2013-04-07	Merge branch 'tb/shared-perm'	blob \| diff \| raw \| diff to current
2013-04-07	Merge branch 'cn/commit-amend-doc'	blob \| diff \| raw \| diff to current
2013-04-07	Merge branch 'jk/diffcore-break-divzero'	blob \| diff \| raw \| diff to current
2013-04-07	Merge branch 'jk/bisect-prn-unsigned'	blob \| diff \| raw \| diff to current
2013-04-07	Merge branch 'jk/filter-branch-come-back-to-original'	blob \| diff \| raw \| diff to current
2013-04-07	Merge branch 'jc/directory-attrs-regression-fix' into...	blob \| diff \| raw \| diff to current
2013-04-05	Merge branch 'jl/submodule-deinit'	blob \| diff \| raw \| diff to current
2013-04-05	Merge branch 'jc/merge-tag-object'	blob \| diff \| raw \| diff to current
2013-04-04	Merge branch 'nd/index-pack-threaded-fixes' into maint	blob \| diff \| raw \| diff to current
2013-04-04	Merge branch 'jk/index-pack-correct-depth-fix' into...	blob \| diff \| raw \| diff to current
2013-04-04	Merge branch 'jk/peel-ref' into maint	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'js/iterm-is-on-osx'	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jk/check-corrupt-objects-carefully'	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jc/apply-ws-fix-tab-in-indent'	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jc/directory-attrs-regression-fix'	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'nd/checkout-paths-reduce-match-pathspec...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'mg/gpg-interface-using-status' into maint	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'bc/commit-complete-lines-given-via-m...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jc/describe' into maint	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jk/alias-in-bare' into maint	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'ks/rfc2047-one-char-at-a-time' into maint	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jk/empty-archive' into maint	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'ph/tag-force-no-warn-on-creation' into...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'lf/setup-prefix-pathspec' into maint	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'kb/name-hash' into maint-1.8.1	blob \| diff \| raw \| diff to current
next