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

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

2013-04-07	Sync with 1.8.2.1	blob \| diff \| raw
2013-04-07	Merge branch 'jk/rm-removed-paths'	blob \| diff \| raw
2013-04-07	Merge branch 'tb/shared-perm'	blob \| diff \| raw
2013-04-07	Merge branch 'cn/commit-amend-doc'	blob \| diff \| raw
2013-04-07	Merge branch 'fc/remote-helpers-test-updates'	blob \| diff \| raw
2013-04-07	Merge branch 'mg/texinfo-5'	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 'rr/triangle'	blob \| diff \| raw
2013-04-07	Merge branch 'mm/status-during-revert'	blob \| diff \| raw
2013-04-07	Merge branch 'jk/set-upstream-error-cases'	blob \| diff \| raw
2013-04-07	Merge branch 'jk/filter-branch-come-back-to-original'	blob \| diff \| raw
2013-04-07	Merge branch 'jc/directory-attrs-regression-fix' into...	blob \| diff \| raw \| diff to current
2013-04-05	Merge branch 'mh/rev-parse-verify-doc'	blob \| diff \| raw
2013-04-05	Merge branch 'sg/gpg-sig'	blob \| diff \| raw
2013-04-05	Merge branch 'jl/submodule-deinit'	blob \| diff \| raw \| diff to current
2013-04-05	Merge branch 'rr/send-email-perl-critique'	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 'rs/submodule-summary-limit' into maint	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 'jc/sha1-name-object-peeler'	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL'	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'rs/submodule-summary-limit'	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'rr/prompt-revert-head'	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
2013-04-03	Merge branch 'kk/revwalk-slop-too-many-commit-within...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jk/checkout-attribute-lookup' into maint...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jk/fully-peeled-packed-ref' into maint...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'yd/doc-merge-annotated-tag' into maint...	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1	blob \| diff \| raw \| diff to current
2013-04-02	Merge branch 'js/log-gpg'	blob \| diff \| raw \| diff to current
2013-04-02	Merge branch 'tr/log-tree-optim'	blob \| diff \| raw \| diff to current
2013-04-02	Merge branch 'tb/cygwin-shared-repository'	blob \| diff \| raw \| diff to current
2013-04-02	Merge branch 'sw/safe-create-leading-dir-race'	blob \| diff \| raw \| diff to current
2013-04-02	Merge branch 'bk/document-commit-tree-S'	blob \| diff \| raw \| diff to current
2013-04-02	Merge branch 'jk/no-more-self-assignment'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'ap/maint-diff-rename-avoid-overlap' into...	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'rr/tests-dedup-test-config' into maint	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'yd/doc-is-in-asciidoc' into maint	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'yd/doc-merge-annotated-tag' into maint	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'nd/index-pack-threaded-fixes'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'jk/index-pack-correct-depth-fix'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'jn/push-tests'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'nd/branch-show-rebase-bisect-state'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'jc/nobody-sets-src-peer-ref'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'jc/remove-export-from-config-mak-in'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'kb/name-hash'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'jk/common-make-variables-export-safety'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'jk/pkt-line-cleanup'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'bc/append-signed-off-by'	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'sr/am-show-final-message-in-applying...	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'rr/test-3200-style'	blob \| diff \| raw \| diff to current
2013-04-01	merge/pull Check for untrusted good GPG signatures	blob \| diff \| raw \| diff to current
2013-04-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2013-04-01	merge/pull: verify GPG signatures of commits being...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'yd/use-test-config-unconfig'	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'kk/revwalk-slop-too-many-commit-within...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'rr/tests-dedup-test-config'	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'yd/doc-is-in-asciidoc'	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'yd/doc-merge-annotated-tag'	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jk/checkout-attribute-lookup'	blob \| diff \| raw \| diff to current
2013-03-26	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw \| diff to current
2013-03-25	Merge branch 'ap/maint-diff-rename-avoid-overlap'	blob \| diff \| raw \| diff to current
2013-03-21	Documentation: merging a tag is a special case	blob \| diff \| raw \| diff to current
2013-03-21	Merge branch 'ob/imap-send-ssl-verify'	blob \| diff \| raw \| diff to current
2013-02-20	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| diff \| raw \| diff to current
2013-02-07	Merge branch 'sb/gpg-plug-fd-leak' into maint	blob \| diff \| raw \| diff to current
2013-02-06	Merge branch 'sb/gpg-plug-fd-leak'	blob \| diff \| raw \| diff to current
2013-02-04	Merge branch 'dl/am-hg-locale' into maint	blob \| diff \| raw \| diff to current
2013-01-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-01-28	Merge branch 'dl/am-hg-locale'	blob \| diff \| raw \| diff to current
2013-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/maint-fast-import-doc-reorder' into...	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/maint-fast-import-doc-dedup-done'...	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'rs/leave-base-name-in-name-field-of-tar...	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| diff \| raw \| diff to current
2013-01-12	Merge branch 'jk/maint-fast-import-doc-reorder'	blob \| diff \| raw \| diff to current
2013-01-12	Merge branch 'jk/shortlog-no-wrap-doc'	blob \| diff \| raw \| diff to current
2013-01-12	Merge branch 'os/gitweb-highlight-uncaptured' into...	blob \| diff \| raw \| diff to current
2013-01-10	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| diff \| raw \| diff to current
2013-01-10	Merge branch 'rs/leave-base-name-in-name-field-of-tar'	blob \| diff \| raw \| diff to current
2013-01-10	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| diff \| raw \| diff to current
next