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

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

2013-06-11	Merge branch 'tr/sha1-file-silence-loose-object-info...	blob \| diff \| raw
2013-06-11	Merge branch 'nd/warn-ambiguous-object-name'	blob \| diff \| raw
2013-06-11	Merge branch 'cr/git-work-tree-sans-git-dir'	blob \| diff \| raw
2013-06-11	Merge branch 'mm/mediawiki-https-fail-message'	blob \| diff \| raw
2013-06-11	Merge branch 'cb/log-follow-with-combined'	blob \| diff \| raw
2013-06-11	Merge branch 'fc/do-not-use-the-index-in-add-to-index'	blob \| diff \| raw
2013-06-11	Merge branch 'rj/mingw-cygwin'	blob \| diff \| raw
2013-06-11	Merge branch 'tr/test-commit-only-on-orphan'	blob \| diff \| raw
2013-06-10	Merge branch 'jn/config-ignore-inaccessible' into maint	blob \| diff \| raw
2013-06-10	Merge branch 'kb/status-ignored-optim-2' into maint	blob \| diff \| raw
2013-06-06	Merge branch 'sb/archive-zip-double-assignment-fix'	blob \| diff \| raw
2013-06-05	Merge branch 'rs/commit-m-no-edit'	blob \| diff \| raw
2013-06-05	Merge branch 'nd/urls-doc-no-file-hyperlink-fix'	blob \| diff \| raw
2013-06-05	Merge branch 'tr/push-no-verify-doc'	blob \| diff \| raw
2013-06-05	Merge branch 'tg/maint-zsh-svn-remote-prompt'	blob \| diff \| raw
2013-06-05	Merge branch 'th/bisect-skip-report-range-fix'	blob \| diff \| raw
2013-06-05	Merge branch 'jc/core-checkstat'	blob \| diff \| raw
2013-06-03	Merge branch 'kb/status-ignored-optim-2'	blob \| diff \| raw
2013-06-02	Merge branch 'tr/line-log'	blob \| diff \| raw
2013-06-02	Merge branch 'mk/combine-diff-context-horizon-fix'	blob \| diff \| raw
2013-06-02	Merge branch 'jc/t5551-posix-sed-bre'	blob \| diff \| raw
2013-06-02	Merge branch 'fc/macos-x-clipped-write'	blob \| diff \| raw
2013-06-02	Merge branch 'nd/clone-local-with-colon'	blob \| diff \| raw
2013-06-02	Merge branch 'fc/fast-export-persistent-marks'	blob \| diff \| raw
2013-06-02	Merge branch 'rs/empty-archive'	blob \| diff \| raw
2013-06-02	Merge branch 'rh/merge-options-doc-fix'	blob \| diff \| raw
2013-06-02	Merge branch 'an/diff-index-doc'	blob \| diff \| raw
2013-06-02	Merge branch 'fc/completion'	blob \| diff \| raw
2013-05-29	Merge branch 'maint-1.8.2' into maint	blob \| diff \| raw
2013-05-29	Merge branch 'jn/config-ignore-inaccessible'	blob \| diff \| raw
2013-05-29	Merge branch 'jk/lookup-object-prefer-latest'	blob \| diff \| raw
2013-05-29	Merge branch 'jk/subtree-do-not-push-if-split-fails'	blob \| diff \| raw
2013-05-29	Merge branch 'jk/test-output'	blob \| diff \| raw
2013-05-29	Merge branch 'rj/sparse'	blob \| diff \| raw
2013-05-29	Merge branch 'mh/packed-refs-various'	blob \| diff \| raw
2013-05-29	Merge branch 'as/check-ignore'	blob \| diff \| raw
2013-05-29	Merge branch 'jh/checkout-auto-tracking'	blob \| diff \| raw
2013-05-29	Merge branch 'jc/prune-all'	blob \| diff \| raw
2013-05-29	Merge branch 'mh/fetch-into-shallow'	blob \| diff \| raw
2013-05-29	Merge branch 'js/transport-helper-error-reporting-fix'	blob \| diff \| raw
2013-05-29	Merge branch 'fc/transport-helper-error-reporting'	blob \| diff \| raw
2013-05-17	Merge branch 'dw/asciidoc-sources-are-dot-txt-files'	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	Sync with v1.8.2.3	blob \| diff \| raw
2013-05-09	Merge branch 'mv/sequencer-pick-error-diag'	blob \| diff \| raw
2013-05-09	Merge branch 'tr/copy-revisions-from-stdin' into maint	blob \| diff \| raw \| diff to current
2013-05-08	Merge git://github.com/git-l10n/git-po	blob \| diff \| raw
2013-05-07	Merge branch 'jk/merge-tree-added-identically'	blob \| diff \| raw
2013-05-07	merge-tree: handle directory/empty conflict correctly	blob \| diff \| raw
2013-05-05	Merge branch 'fc/push-with-export-reporting-result'	blob \| diff \| raw \| diff to current
2013-05-03	Merge branch 'tr/unpack-entry-use-after-free-fix'	blob \| diff \| raw \| diff to current
2013-05-03	Sync with maint	blob \| diff \| raw \| diff to current
2013-05-01	Merge branch 'hb/git-pm-tempfile'	blob \| diff \| raw \| diff to current
2013-05-01	Merge branch 'rs/pp-user-info-without-extra-allocation'	blob \| diff \| raw \| diff to current
2013-05-01	Merge branch 'tr/remote-tighten-commandline-parsing'	blob \| diff \| raw \| diff to current
2013-05-01	Merge branch 'zk/prompt-rebase-step'	blob \| diff \| raw \| diff to current
2013-04-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2013-04-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2013-04-28	Merge branch 'nd/pretty-formats'	blob \| diff \| raw \| diff to current
2013-04-28	Merge branch 'jk/check-corrupt-objects-carefully'	blob \| diff \| raw \| diff to current
2013-04-28	Merge branch 'jk/merge-tree-added-identically'	blob \| diff \| raw \| diff to current
2013-04-28	merge-tree: fix typo in "both changed identically"	blob \| diff \| raw \| diff to current
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
next