Andrew's git - gitweb.git/history - Documentation/merge-options.txt

[gitweb.git] / Documentation / merge-options.txt

2013-06-02	Merge branch 'jc/t5551-posix-sed-bre'	blob \| diff \| raw
2013-06-02	Merge branch 'da/darwin'	blob \| diff \| raw
2013-06-02	Merge branch 'fc/macos-x-clipped-write'	blob \| diff \| raw
2013-06-02	Merge branch 'vv/help-unknown-ref'	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 \| diff to current
2013-05-29	Merge branch 'maint-1.8.2' into maint	blob \| diff \| raw \| diff to current
2013-05-29	Merge branch 'jn/config-ignore-inaccessible'	blob \| diff \| raw \| diff to current
2013-05-29	Merge branch 'jk/lookup-object-prefer-latest'	blob \| diff \| raw \| diff to current
2013-05-29	Merge branch 'jk/subtree-do-not-push-if-split-fails'	blob \| diff \| raw \| diff to current
2013-05-29	Merge branch 'jk/test-output'	blob \| diff \| raw \| diff to current
2013-05-29	Merge branch 'mh/packed-refs-various'	blob \| diff \| raw \| diff to current
2013-05-29	Merge branch 'as/check-ignore'	blob \| diff \| raw \| diff to current
2013-05-29	Merge branch 'jc/prune-all'	blob \| diff \| raw \| diff to current
2013-05-17	Merge branch 'dw/asciidoc-sources-are-dot-txt-files'	blob \| diff \| raw \| diff to current
2013-05-17	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-05-16	Documentation/merge-options.txt: restore `-e` option	blob \| diff \| raw \| diff to current
2013-05-13	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-05-09	Sync with v1.8.2.3	blob \| diff \| raw \| diff to current
2013-05-09	Merge branch 'tr/copy-revisions-from-stdin' into maint	blob \| diff \| raw \| diff to current
2013-05-07	Merge branch 'jk/merge-tree-added-identically'	blob \| diff \| raw \| diff to current
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 '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-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	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	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-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 'rr/prompt-revert-head' into maint	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 'jk/chopped-ident'	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 '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 '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 'jk/http-dumb-namespaces'	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 'jk/daemon-user-doc'	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-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2013-04-15	Merge branch 'jk/diff-graph-submodule-summary'	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 'lf/bundle-with-tip-wo-message'	blob \| diff \| raw \| diff to current
2013-04-15	Merge branch 'jk/show-branch-strbuf'	blob \| diff \| raw \| diff to current
2013-04-15	Merge branch 'tr/perl-keep-stderr-open'	blob \| diff \| raw \| diff to current
2013-04-15	Merge branch 'po/help-guides'	blob \| diff \| raw \| diff to current
2013-04-12	Sync with 'maint'	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 'rr/send-email-perl-critique' into maint	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into...	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 'maint'	blob \| diff \| raw \| diff to current
2013-04-12	Merge branch 'ap/combine-diff-coalesce-lost'	blob \| diff \| raw \| diff to current
next