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

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

2017-05-30	Merge branch 'jc/name-rev-lw-tag'	blob \| diff \| raw
2017-05-29	Merge branch 'jk/ignore-broken-tags-when-ignoring-missi...	blob \| diff \| raw
2017-05-29	Merge branch 'jk/alternate-ref-optim'	blob \| diff \| raw
2017-05-29	Merge branch 'tg/stash-push-fixup'	blob \| diff \| raw
2017-05-29	Merge branch 'pw/rebase-i-regression-fix'	blob \| diff \| raw
2017-05-29	Merge branch 'kn/ref-filter-branch-list'	blob \| diff \| raw
2017-05-29	Merge branch 'km/log-showsignature-doc'	blob \| diff \| raw
2017-05-29	Merge branch 'jk/update-links-in-docs'	blob \| diff \| raw
2017-05-29	Merge branch 'ja/do-not-ask-needless-questions'	blob \| diff \| raw
2017-05-29	Merge branch 'sg/core-filemode-doc-typofix'	blob \| diff \| raw
2017-05-29	Merge branch 'jc/read-tree-empty-with-m'	blob \| diff \| raw
2017-05-29	Merge branch 'jk/disable-pack-reuse-when-broken'	blob \| diff \| raw
2017-05-29	Merge branch 'jk/diff-submodule-diff-inline'	blob \| diff \| raw
2017-05-29	Merge branch 'jc/repack-threads'	blob \| diff \| raw
2017-05-23	Merge branch 'jt/push-options-doc'	blob \| diff \| raw
2017-05-23	Merge branch 'rs/checkout-am-fix-unborn'	blob \| diff \| raw
2017-05-23	Merge branch 'ls/travis-relays-for-windows-ci'	blob \| diff \| raw
2017-05-23	Merge branch 'ah/log-decorate-default-to-auto'	blob \| diff \| raw
2017-05-16	Merge branch 'jc/apply-fix-mismerge'	blob \| diff \| raw
2017-05-16	Merge branch 'ab/aix-needs-compat-regex'	blob \| diff \| raw
2017-05-16	Merge branch 'jn/credential-doc-on-clear'	blob \| diff \| raw
2017-05-16	Merge branch 'jn/clone-add-empty-config-from-command...	blob \| diff \| raw
2017-05-16	Merge branch 'ls/travis-doc-asciidoctor'	blob \| diff \| raw
2017-05-16	Merge branch 'rs/large-zip'	blob \| diff \| raw
2017-05-16	Merge branch 'jk/am-leakfix'	blob \| diff \| raw
2017-05-16	Merge branch 'jt/use-trailer-api-in-commands'	blob \| diff \| raw
2017-05-16	Merge branch 'nd/worktree-kill-parse-ref'	blob \| diff \| raw
2017-05-16	Merge branch 'dt/gc-ignore-old-gc-logs'	blob \| diff \| raw
2017-05-16	Merge branch 'jk/no-null-sha1-in-cache-tree'	blob \| diff \| raw
2017-05-09	Sync with v2.12.3	blob \| diff \| raw
2017-05-09	Merge branch 'jh/verify-index-checksum-only-in-fsck'	blob \| diff \| raw
2017-05-05	Merge branch 'maint-2.11' into maint	blob \| diff \| raw \| diff to current
2017-05-05	Merge branch 'maint-2.8' into maint-2.9	blob \| diff \| raw \| diff to current
2017-05-05	Merge branch 'maint-2.5' into maint-2.6	blob \| diff \| raw \| diff to current
2017-05-05	Merge branch 'maint-2.4' into maint-2.5	blob \| diff \| raw \| diff to current
2017-05-04	Merge branch 'sr/hooks-cwd-doc'	blob \| diff \| raw
2017-05-04	Merge branch 'rg/doc-submittingpatches-wordfix'	blob \| diff \| raw
2017-05-04	Merge branch 'rg/doc-pull-typofix'	blob \| diff \| raw
2017-05-01	Merge branch 'jk/submodule-init-segv-fix'	blob \| diff \| raw
2017-05-01	Merge branch 'jk/prio-queue-avoid-swap-with-self'	blob \| diff \| raw
2017-04-26	Merge branch 'mh/separate-ref-cache'	blob \| diff \| raw
2017-04-26	Merge branch 'jk/update-links-in-docs'	blob \| diff \| raw
2017-04-26	Merge branch 'sf/putty-w-args'	blob \| diff \| raw
2017-04-26	Merge branch 'cc/split-index-config'	blob \| diff \| raw
2017-04-26	Merge branch 'jk/war-on-git-path'	blob \| diff \| raw
2017-04-26	Merge branch 'ss/submodule-shallow-doc'	blob \| diff \| raw
2017-04-26	Merge branch 'ss/gitmodules-ignore-doc'	blob \| diff \| raw
2017-04-26	Merge branch 'ab/push-cas-doc-n-test'	blob \| diff \| raw
2017-04-26	Merge branch 'ls/travis-coccicheck'	blob \| diff \| raw
2017-04-26	Merge branch 'ps/pathspec-empty-prefix-origin'	blob \| diff \| raw
2017-04-26	Merge branch 'gb/rebase-signoff'	blob \| diff \| raw
2017-04-24	Merge branch 'dt/xgethostname-nul-termination'	blob \| diff \| raw
2017-04-24	Merge branch 'rs/misc-cppcheck-fixes'	blob \| diff \| raw
2017-04-24	Merge branch 'jk/snprintf-cleanups'	blob \| diff \| raw
2017-04-24	Merge branch 'xy/format-patch-base'	blob \| diff \| raw
2017-04-24	Merge branch 'sb/checkout-recurse-submodules'	blob \| diff \| raw
2017-04-24	Merge branch 'jt/fetch-pack-error-reporting'	blob \| diff \| raw
2017-04-24	Merge branch 'km/t1400-modernization'	blob \| diff \| raw
2017-04-24	Merge branch 'jk/quarantine-received-objects'	blob \| diff \| raw
2017-04-24	Merge branch 'jk/loose-object-fsck'	blob \| diff \| raw
2017-04-24	Merge branch 'jh/verify-index-checksum-only-in-fsck'	blob \| diff \| raw
2017-04-24	Merge branch 'jh/unpack-trees-micro-optim'	blob \| diff \| raw
2017-04-24	Merge branch 'jh/string-list-micro-optim'	blob \| diff \| raw
2017-04-24	Merge branch 'nd/conditional-config-include'	blob \| diff \| raw
2017-04-24	Merge branch 'tb/doc-eol-normalization'	blob \| diff \| raw
2017-04-24	Merge branch 'sr/http-proxy-configuration-fix'	blob \| diff \| raw
2017-04-20	Merge branch 'jh/memihash-opt'	blob \| diff \| raw
2017-04-20	Merge branch 'vn/revision-shorthand-for-side-branch...	blob \| diff \| raw
2017-04-20	Merge branch 'sf/putty-w-args'	blob \| diff \| raw
2017-04-20	Merge branch 'ld/p4-current-branch-fix'	blob \| diff \| raw
2017-04-20	Merge branch 'dt/gc-ignore-old-gc-logs'	blob \| diff \| raw
2017-04-20	Merge branch 'bw/attr-pathspec'	blob \| diff \| raw
2017-04-20	Merge branch 'ab/grep-plug-pathspec-leak'	blob \| diff \| raw
2017-04-20	Merge branch 'jk/no-looking-at-dotgit-outside-repo'	blob \| diff \| raw
2017-04-20	Merge branch 'nd/files-backend-git-dir'	blob \| diff \| raw
2017-04-20	Merge branch 'bw/submodule-is-active'	blob \| diff \| raw
2017-04-20	Merge branch 'va/i18n-perl-scripts'	blob \| diff \| raw
2017-04-20	Merge branch 'sb/submodule-rm-absorb'	blob \| diff \| raw
2017-04-20	Merge branch 'ah/diff-files-ours-theirs-doc'	blob \| diff \| raw
2017-04-20	Merge branch 'lt/mailinfo-in-body-header-continuation'	blob \| diff \| raw
2017-04-20	Merge branch 'bc/object-id'	blob \| diff \| raw
2017-04-20	Merge branch 'sb/submodule-short-status'	blob \| diff \| raw
2017-04-17	Merge branch 'js/difftool-builtin'	blob \| diff \| raw
2017-04-17	Merge branch 'sb/unpack-trees-would-lose-submodule...	blob \| diff \| raw
2017-04-17	Merge branch 'ab/regen-perl-mak-with-different-perl'	blob \| diff \| raw
2017-04-17	Merge branch 'sb/show-diff-for-submodule-in-diff-fix'	blob \| diff \| raw
2017-04-17	Merge branch 'qp/bisect-docfix'	blob \| diff \| raw
2017-04-17	Merge branch 'mm/ls-files-s-doc'	blob \| diff \| raw
2017-04-17	Merge branch 'jk/loose-object-info-report-error'	blob \| diff \| raw
2017-04-17	Merge branch 'jc/bs-t-is-not-a-tab-for-sed'	blob \| diff \| raw
2017-04-17	Merge branch 'jc/unused-symbols'	blob \| diff \| raw
2017-04-17	Merge branch 'jk/snprintf-cleanups'	blob \| diff \| raw
2017-04-11	Merge branch 'ls/travis-relays-for-windows-ci'	blob \| diff \| raw
2017-04-11	Merge branch 'cc/untracked'	blob \| diff \| raw
2017-04-11	Merge branch 'ah/log-decorate-default-to-auto'	blob \| diff \| raw
2017-04-11	Merge branch 'ab/ref-filter-no-contains'	blob \| diff \| raw
2017-03-30	Merge branch 'jk/make-coccicheck-detect-errors'	blob \| diff \| raw
2017-03-30	Merge branch 'bc/push-cert-receive-fix'	blob \| diff \| raw
2017-03-30	Merge branch 'mh/notes-tree-consolidate-fix'	blob \| diff \| raw
2017-03-30	Merge branch 'js/rebase-i-reword-to-run-hooks'	blob \| diff \| raw
next