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

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

2015-10-15	Merge branch 'ls/p4-translation-failure'	blob \| diff \| raw
2015-10-15	Merge branch 'nd/gc-auto-background-fix'	blob \| diff \| raw
2015-10-15	Merge branch 'mk/submodule-gitdir-path'	blob \| diff \| raw
2015-10-14	Merge branch 'pt/pull-builtin'	blob \| diff \| raw
2015-10-14	Merge branch 'nd/ls-remote-does-not-have-u-option'	blob \| diff \| raw
2015-10-14	Merge branch 'jk/asciidoctor-section-heading-markup...	blob \| diff \| raw
2015-10-14	Merge branch 'tk/typofix-connect-unknown-proto-error'	blob \| diff \| raw
2015-10-14	Merge branch 'jk/notes-dwim-doc'	blob \| diff \| raw
2015-10-07	Merge branch 'ls/p4-path-encoding'	blob \| diff \| raw
2015-10-07	Merge branch 'gb/filter-branch-progress'	blob \| diff \| raw
2015-10-07	Merge branch 'nd/ignore-then-not-ignore'	blob \| diff \| raw
2015-10-07	Merge branch 'ti/glibc-stdio-mutex-from-signal-handler'	blob \| diff \| raw
2015-10-05	Sync with 2.6.1	blob \| diff \| raw
2015-10-05	Merge branch 'mm/keyid-docs'	blob \| diff \| raw
2015-10-05	Merge branch 'bb/remote-get-url'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/blame-first-parent'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jw/make-arflags-customizable'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/rebase-no-autostash'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'sb/submodule-helper'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'kn/for-each-tag'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/test-lint-forbid-when-finished-in...	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/interpret-trailers-outside-a-repository'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'as/subtree-with-spaces'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/connect-clear-env'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/date-local'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'dt/refs-bisection'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'nk/stash-show-config'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/async-pkt-line'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jh/quiltimport-explicit-series-file'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'ld/p4-import-labels'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'ad/bisect-terms'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jc/rerere'	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'kn/for-each-tag-branch'	blob \| diff \| raw \| diff to current
2015-09-29	Sync with v2.5.4	blob \| diff \| raw \| diff to current
2015-09-28	Sync with 2.4.10	blob \| diff \| raw \| diff to current
2015-09-28	Sync with 2.3.10	blob \| diff \| raw \| diff to current
2015-09-21	Merge branch 'rj/mailmap-ramsay'	blob \| diff \| raw \| diff to current
2015-09-21	Merge branch 'bn/send-email-smtp-auth-error-message...	blob \| diff \| raw \| diff to current
2015-09-21	Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com...	blob \| diff \| raw \| diff to current
2015-09-21	Documentation: explain optional arguments better	blob \| diff \| raw \| diff to current
2015-09-21	Documentation: use 'keyid' consistently, not 'key-id'	blob \| diff \| raw \| diff to current
2015-09-17	Sync with 2.5.3	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'po/doc-branch-desc'	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'as/config-doc-markup-fix'	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'br/svn-doc-include-paths-config' into...	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'ah/submodule-typofix-in-error' into maint	blob \| diff \| raw \| diff to current
2015-09-17	Merge branch 'js/maint-am-skip-performance-regression...	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'js/maint-am-skip-performance-regression'	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'sg/help-group'	blob \| diff \| raw \| diff to current
2015-09-14	doc: show usage of branch description	blob \| diff \| raw \| diff to current
2015-09-14	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'mp/t7060-diff-index-test'	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'gb/apply-comment-typofix'	blob \| diff \| raw \| diff to current
2015-09-04	Sync with 2.4.9	blob \| diff \| raw \| diff to current
2015-09-04	Sync with 2.3.9	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'ee/clean-test-fixes' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'cc/trailers-corner-case-fix' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'rs/archive-zip-many' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'jc/calloc-pathspec' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'sg/wt-status-header-inclusion' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'sg/t3020-typofix' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'as/docfix-reflog-expire-unreachable'...	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'jk/fix-alias-pager-config-key-warnings...	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'nd/dwim-wildcards-as-pathspecs' into...	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'sg/help-group' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'jh/strbuf-read-use-read-in-full' into...	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'cb/open-noatime-clear-errno' into maint	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'mh/get-remote-group-fix' into maint	blob \| diff \| raw \| diff to current
2015-09-02	Merge branch 'cc/trailers-corner-case-fix'	blob \| diff \| raw \| diff to current
2015-09-02	Merge branch 'ee/clean-test-fixes'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'rs/archive-zip-many'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'ah/submodule-typofix-in-error'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'ah/reflog-typofix-in-error'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'ah/read-tree-usage-string'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'ah/pack-objects-usage-strings'	blob \| diff \| raw \| diff to current
2015-09-01	Merge branch 'br/svn-doc-include-paths-config'	blob \| diff \| raw \| diff to current
2015-08-31	Merge branch 'sg/describe-contains'	blob \| diff \| raw \| diff to current
2015-08-31	Merge branch 'db/push-sign-if-asked'	blob \| diff \| raw \| diff to current
2015-08-31	Merge branch 'jk/fix-alias-pager-config-key-warnings'	blob \| diff \| raw \| diff to current
2015-08-28	Merge branch 'cc/trailers-corner-case-fix'	blob \| diff \| raw \| diff to current
2015-08-26	Merge branch 'sg/help-group'	blob \| diff \| raw \| diff to current
2015-08-26	Merge branch 'sg/wt-status-header-inclusion'	blob \| diff \| raw \| diff to current
2015-08-26	Merge branch 'as/docfix-reflog-expire-unreachable'	blob \| diff \| raw \| diff to current
2015-08-26	Merge branch 'sg/t3020-typofix'	blob \| diff \| raw \| diff to current
2015-08-26	Merge branch 'jc/calloc-pathspec'	blob \| diff \| raw \| diff to current
2015-08-25	Merge branch 'jk/guess-repo-name-regression-fix' into...	blob \| diff \| raw \| diff to current
2015-08-25	Merge branch 'jk/test-with-x' into maint	blob \| diff \| raw \| diff to current
2015-08-25	Merge branch 'sb/check-return-from-read-ref' into maint	blob \| diff \| raw \| diff to current
2015-08-25	Merge branch 'cb/open-noatime-clear-errno'	blob \| diff \| raw \| diff to current
2015-08-25	Merge branch 'dt/notes-multiple'	blob \| diff \| raw \| diff to current
2015-08-25	Merge branch 'nd/dwim-wildcards-as-pathspecs'	blob \| diff \| raw \| diff to current
2015-08-25	Merge branch 'jh/strbuf-read-use-read-in-full'	blob \| diff \| raw \| diff to current
2015-08-19	Merge branch 'jc/finalize-temp-file'	blob \| diff \| raw \| diff to current
2015-08-19	Merge branch 'ps/guess-repo-name-at-root'	blob \| diff \| raw \| diff to current
2015-08-19	Merge branch 'jk/guess-repo-name-regression-fix'	blob \| diff \| raw \| diff to current
2015-08-19	Merge branch 'jk/test-with-x'	blob \| diff \| raw \| diff to current
2015-08-19	Merge branch 'sb/check-return-from-read-ref'	blob \| diff \| raw \| diff to current
2015-08-19	Merge branch 'ta/docfix-index-format-tech' into maint	blob \| diff \| raw \| diff to current
2015-08-19	Merge branch 'sb/remove-unused-var-from-builtin-add...	blob \| diff \| raw \| diff to current
next