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

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

2016-06-06	Merge branch 'ar/diff-args-osx-precompose' into maint	blob \| diff \| raw
2016-06-03	Merge branch 'rs/apply-name-terminate'	blob \| diff \| raw \| diff to current
2016-06-03	Merge branch 'rs/patch-id-use-skip-prefix'	blob \| diff \| raw \| diff to current
2016-06-03	Merge branch 'mm/makefile-developer-can-be-in-config...	blob \| diff \| raw \| diff to current
2016-06-03	Merge branch 'pa/cherry-pick-doc-typo'	blob \| diff \| raw \| diff to current
2016-06-03	Merge branch 'js/rebase-i-dedup-call-to-rerere'	blob \| diff \| raw \| diff to current
2016-05-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2016-05-31	Merge branch 'jk/test-send-sh-x-trace-elsewhere' into...	blob \| diff \| raw
2016-05-31	Merge branch 'js/name-rev-use-oldest-ref' into maint	blob \| diff \| raw
2016-05-31	Merge branch 'es/t1500-modernize'	blob \| diff \| raw \| diff to current
2016-05-31	Merge branch 'jk/cat-file-buffered-batch-all'	blob \| diff \| raw \| diff to current
2016-05-31	Merge branch 'fc/fast-import-broken-marks-file'	blob \| diff \| raw \| diff to current
2016-05-30	Merge branch 'ak/t0008-ksh88-workaround'	blob \| diff \| raw \| diff to current
2016-05-30	Merge branch 'js/t6044-use-test-seq'	blob \| diff \| raw \| diff to current
2016-05-30	Merge branch 'rj/log-decorate-auto'	blob \| diff \| raw \| diff to current
2016-05-30	Merge branch 'kb/msys2-tty'	blob \| diff \| raw \| diff to current
2016-05-26	Sync with maint	blob \| diff \| raw \| diff to current
2016-05-26	Merge branch 'sb/z-is-gnutar-ism' into maint	blob \| diff \| raw
2016-05-26	Merge branch 'ak/t4151-ls-files-could-be-empty' into...	blob \| diff \| raw
2016-05-26	Merge branch 'jc/test-seq' into maint	blob \| diff \| raw
2016-05-26	Merge branch 'tb/t5601-sed-fix' into maint	blob \| diff \| raw
2016-05-26	Merge branch 'va/mailinfo-doc-typofix' into maint	blob \| diff \| raw
2016-05-26	Merge branch 'jk/war-on-sprintf' into maint-2.7	blob \| diff \| raw
2016-05-26	Merge branch 'fix_fr' of git://github.com/jnavila/git	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'jc/rerere-multi'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'da/difftool'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'ar/diff-args-osx-precompose'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'jc/doc-lint'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'jc/test-parse-options-expect'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'pb/commit-verbose-config'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'xy/format-patch-base'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'tb/core-eol-fix'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'nd/worktree-various-heads'	blob \| diff \| raw \| diff to current
2016-05-23	Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'	blob \| diff \| raw \| diff to current
2016-05-18	Sync with 2.8.3	blob \| diff \| raw \| diff to current
2016-05-18	Merge branch 'jk/push-client-deadlock-fix'	blob \| diff \| raw \| diff to current
2016-05-18	Merge branch 'rn/glossary-typofix' into HEAD	blob \| diff \| raw
2016-05-18	Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD	blob \| diff \| raw
2016-05-18	Merge branch 'sk/gitweb-highlight-encoding' into HEAD	blob \| diff \| raw
2016-05-18	Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD	blob \| diff \| raw
2016-05-18	Merge branch 'jd/send-email-to-whom' into HEAD	blob \| diff \| raw
2016-05-17	Merge branch 'kf/gpg-sig-verification-doc'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'js/windows-dotgit'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'va/mailinfo-doc-typofix'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'jk/test-send-sh-x-trace-elsewhere'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'js/http-custom-headers'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'jk/rebase-interative-eval-fix'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'jc/fsck-nul-in-commit'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'nd/test-helpers'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'ls/travis-build-doc'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'jc/ll-merge-internal'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'jc/linkgit-fix'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'va/i18n-remote-comment-to-align'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'tb/t5601-sed-fix'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'nd/error-errno'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'jc/test-seq'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'es/test-gpg-tags'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'ak/t4151-ls-files-could-be-empty'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'jk/submodule-c-credential'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'nd/remote-plural-ours-plus-theirs'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'bn/config-doc-tt-varnames'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'va/i18n-misc-updates'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'sb/z-is-gnutar-ism'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'lp/typofixes'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'sb/submodule-deinit-all'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'jc/config-pathname-type'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'bn/http-cookiefile-config'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'ab/hooks'	blob \| diff \| raw \| diff to current
2016-05-17	Merge branch 'sb/submodule-init'	blob \| diff \| raw \| diff to current
2016-05-13	Merge branch 'sb/submodule-module-list-pathspec-fix'	blob \| diff \| raw \| diff to current
2016-05-13	Merge branch 'jc/commit-tree-ignore-commit-gpgsign'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'sk/gitweb-highlight-encoding'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'sb/clean-test-fix'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'rn/glossary-typofix'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'ls/travis-submitting-patches'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'js/close-packs-before-gc'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'ew/normal-to-e'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'ls/p4-lfs'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'sb/misc-cleanups'	blob \| diff \| raw \| diff to current
2016-05-10	Merge branch 'ew/doc-split-pack-disables-bitmap'	blob \| diff \| raw \| diff to current
2016-05-06	Sync with maint	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'kn/for-each-tag-branch' into maint	blob \| diff \| raw
2016-05-06	Merge branch 'jk/diff-compact-heuristic'	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'ls/p4-lfs-test-fix-2.7.0'	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'bc/object-id'	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'bw/rebase-merge-entire-branch'	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'jc/drop-git-spec-in'	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'js/http-custom-headers'	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'sb/clone-shallow-passthru'	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'ld/p4-test-py3'	blob \| diff \| raw \| diff to current
2016-05-06	Merge branch 'sb/config-exit-status-list'	blob \| diff \| raw \| diff to current
2016-05-03	Sync with maint	blob \| diff \| raw \| diff to current
2016-05-03	Merge branch 'nf/mergetool-prompt'	blob \| diff \| raw \| diff to current
2016-05-03	Merge branch 'jd/send-email-to-whom'	blob \| diff \| raw \| diff to current
2016-05-03	Merge branch 'rt/string-list-lookup-cleanup'	blob \| diff \| raw \| diff to current
2016-05-03	Merge branch 'jk/fix-attribute-macro-in-2.5'	blob \| diff \| raw \| diff to current
2016-05-03	Merge branch 'sg/test-lib-simplify-expr-away'	blob \| diff \| raw \| diff to current
2016-05-03	Merge branch 'nd/remove-unused'	blob \| diff \| raw \| diff to current
2016-05-03	Merge branch 'js/name-rev-use-oldest-ref'	blob \| diff \| raw \| diff to current
2016-05-03	Merge branch 'jd/p4-jobs-in-commit'	blob \| diff \| raw \| diff to current
next