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

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

2018-08-14	Merge branch 'es/format-patch-interdiff' into es/format...	blob \| diff \| raw
2018-08-02	Merge branch 'jt/commit-graph-per-object-store'	blob \| diff \| raw
2018-08-02	Merge branch 'es/chain-lint-in-subshell'	blob \| diff \| raw
2018-08-02	Merge branch 'jt/tags-to-promised-blobs-fix'	blob \| diff \| raw
2018-08-02	Merge branch 'jt/fetch-negotiator-skipping'	blob \| diff \| raw
2018-08-02	Merge branch 'jm/send-email-tls-auth-on-batch'	blob \| diff \| raw
2018-08-02	Merge branch 'bc/sequencer-export-work-tree-as-well'	blob \| diff \| raw
2018-08-02	Merge branch 'en/t7405-recursive-submodule-conflicts'	blob \| diff \| raw
2018-08-02	Merge branch 'en/t6036-merge-recursive-tests'	blob \| diff \| raw
2018-08-02	Merge branch 'en/dirty-merge-fixes'	blob \| diff \| raw
2018-08-02	Merge branch 'js/rebase-merge-octopus'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'jt/fetch-nego-tip'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'is/parsing-line-range'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'jt/fetch-pack-negotiator'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'ab/checkout-default-remote'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'sb/diff-color-move-more'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'sg/httpd-test-unflake'	blob \| diff \| raw \| diff to current
2018-08-02	Merge branch 'jk/has-uncommitted-changes-fix'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'sb/blame-color'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'nd/command-list'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'wc/find-commit-with-pattern-on-detached...	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'jc/t3404-one-shot-export-fix'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'jk/empty-pick-fix'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'tb/config-default'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'jk/fetch-all-peeled-fix'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'ag/rebase-p'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'jk/for-each-ref-icase'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'sb/submodule-move-head-error-msg'	blob \| diff \| raw \| diff to current
2018-07-24	Merge branch 'rj/submodule-fsck-skip'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'js/enhanced-version-info'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'ms/core-icase-doc'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'ds/commit-graph'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'tz/exclude-doc-smallfixes'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'js/rebase-recreate-merge'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'en/rebase-i-microfixes'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'mb/filter-branch-optim'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'dj/runtime-prefix'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'bw/protocol-v2'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'bw/config-refer-to-gitsubmodules-doc'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'xy/format-patch-prereq-patch-id-fix'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'ds/ewah-cleanup'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'sb/submodule-core-worktree'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'sb/object-store-grafts'	blob \| diff \| raw \| diff to current
2018-07-18	Merge branch 'en/merge-recursive-cleanup'	blob \| diff \| raw \| diff to current
2018-07-16	Merge branch 'jc/t3404-one-shot-export-fix' into es...	blob \| diff \| raw \| diff to current
2018-07-11	merge: allow reading the merge commit message from...	blob \| diff \| raw \| diff to current
2018-07-11	merge: fix misleading pre-merge check documentation	blob \| diff \| raw \| diff to current
2018-06-29	Merge branch 'sb/object-store-grafts' into sb/object...	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'sb/fix-fetching-moved-submodules'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'tz/cred-netrc-cleanup'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'jc/clean-after-sanity-tests'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'nd/completion-negation'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'pw/add-p-recount'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'jk/fetch-all-peeled-fix'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'ms/send-pack-honor-config'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'jh/partial-clone'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'sg/gpg-tests-fix'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'as/safecrlf-quiet-fix'	blob \| diff \| raw \| diff to current
2018-06-28	Merge branch 'ab/refspec-init-fix'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'sb/plug-misc-leaks'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'cc/tests-without-assuming-ref-files-backend'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'sg/update-ref-stdin-cleanup'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'nd/reject-empty-shallow-request'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'ls/complete-remote-update-names'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'ag/rebase-p'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'nd/complete-config-vars'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'sb/object-store-alloc'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'jk/show-index'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'en/merge-recursive-tests'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'nd/diff-apply-ita'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'ds/commit-graph-lockfile-fix'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'nd/commit-util-to-slab'	blob \| diff \| raw \| diff to current
2018-06-25	Merge branch 'pc/submodule-helper-foreach'	blob \| diff \| raw \| diff to current
2018-06-19	Merge branch 'en/rename-directory-detection-reboot'	blob \| diff \| raw \| diff to current
2018-06-19	Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com...	blob \| diff \| raw \| diff to current
2018-06-19	Merge branch 'cf/submodule-progress-dissociate'	blob \| diff \| raw \| diff to current
2018-06-19	Merge branch 'js/rebase-i-root-fix'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'es/make-no-iconv'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'sg/t7406-chain-fix'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'ks/branch-set-upstream'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'js/rebase-i-root-fix'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'jk/ewah-bounds-check'	blob \| diff \| raw \| diff to current
2018-06-18	Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git...	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'sb/blame-color'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'mw/doc-merge-enumfix'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'km/doc-workflows-typofix'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'rd/diff-options-typofix'	blob \| diff \| raw \| diff to current
2018-06-14	doc: update the order of the syntax `git merge --continue`	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'sb/grep-die-on-unreadable-index'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'nd/repo-clear-keep-the-index'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'tb/test-apfs-utf8-normalization'	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.15.2	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.14.4	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.13.7	blob \| diff \| raw \| diff to current
2018-05-22	Merge branch 'jk/submodule-name-verify-fix' into jk...	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'nd/submodule-status-fix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'ab/git-svn-get-record-typofix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'sg/doc-gc-quote-mismatch-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'bp/fsmonitor-bufsize-fix'	blob \| diff \| raw \| diff to current
next