git.oblomov.eu Git - git/history - Documentation/git-merge.txt

2017-01-18	Junio C Hamano	Merge branch 'km/branch-get-push-while-detached'	blob \| commitdiff \| raw
2017-01-18	Junio C Hamano	Merge branch 'jk/rebase-i-squash-count-fix'	blob \| commitdiff \| raw
2017-01-18	Junio C Hamano	Merge branch 'jk/blame-fixes'	blob \| commitdiff \| raw
2017-01-18	Junio C Hamano	Merge branch 'jk/archive-zip-userdiff-config'	blob \| commitdiff \| raw
2017-01-18	Junio C Hamano	Merge branch 'dt/disable-bitmap-in-auto-gc'	blob \| commitdiff \| raw
2017-01-18	Junio C Hamano	Merge branch 'ls/p4-retry-thrice'	blob \| commitdiff \| raw
2017-01-18	Junio C Hamano	Merge branch 'sb/submodule-rm-absorb'	blob \| commitdiff \| raw
2017-01-18	Junio C Hamano	Merge branch 'bw/grep-recurse-submodules'	blob \| commitdiff \| raw
2017-01-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2017-01-17	Junio C Hamano	Merge branch 'mm/gc-safety-doc' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'mm/push-social-engineering-attack-doc...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'lr/doc-fix-cet' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'sb/t3600-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'sb/unpack-trees-grammofix' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'mk/mingw-winansi-ttyname-termination...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jc/push-default-explicit' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jc/pull-rebase-ff' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'jc/renormalize-merge-kill-safer-crlf...	blob \| commitdiff \| raw \| diff to current
2017-01-17	Junio C Hamano	Merge branch 'bb/unicode-9.0' into maint	blob \| commitdiff \| raw \| diff to current
2017-01-10	Junio C Hamano	Merge branch 'sb/submodule-embed-gitdir'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'jc/retire-compaction-heuristics'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'nd/config-misc-fixes'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'jc/abbrev-autoscale-config'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'mh/fast-import-notes-fix-new'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'jc/git-open-cloexec'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'jc/compression-config'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'dt/smart-http-detect-server-going-away'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'mm/gc-safety-doc'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'mm/push-social-engineering-attack-doc'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'jt/fetch-no-redundant-tag-fetch-map'	blob \| commitdiff \| raw
2017-01-10	Junio C Hamano	Merge branch 'jc/latin-1'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'jc/lock-report-on-error'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'js/mingw-isatty'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'ls/p4-lfs'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'va/i18n-even-more'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'lt/shortlog-by-committer'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'mk/mingw-winansi-ttyname-termination...	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'gv/p4-multi-path-commit-fix'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'jk/difftool-in-subdir'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'ld/p4-compare-dir-vs-symlink'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'ls/filter-process'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'bw/transport-protocol-policy'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'cp/merge-continue'	blob \| commitdiff \| raw
2016-12-27	Junio C Hamano	Merge branch 'jc/push-default-explicit'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'lr/doc-fix-cet'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'sb/t3600-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'jc/pull-rebase-ff'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'bb/unicode-9.0'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'nd/rebase-forget'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'sb/unpack-trees-grammofix'	blob \| commitdiff \| raw \| diff to current
2016-12-19	Junio C Hamano	Merge branch 'jc/renormalize-merge-kill-safer-crlf'	blob \| commitdiff \| raw \| diff to current
2016-12-14	Chris Packham	merge: add '--continue' option as a synonym for 'git...	blob \| commitdiff \| raw
2016-11-29	Junio C Hamano	Merge branch 'tk/diffcore-delta-remove-unused' into...	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'nd/worktree-lock' into maint	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'ps/common-info-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'nd/test-helpers' into maint	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into...	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'rs/commit-pptr-simplify' into maint	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'jk/rebase-config-insn-fmt-docfix' into...	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'jk/daemon-path-ok-check-truncation' into...	blob \| commitdiff \| raw \| diff to current
2016-11-29	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft-after-address...	blob \| commitdiff \| raw \| diff to current
2016-11-23	Junio C Hamano	Merge branch 'js/rebase-i-commentchar-fix'	blob \| commitdiff \| raw \| diff to current
2016-11-23	Junio C Hamano	Merge branch 'jc/for-each-ref-head-segfault-fix'	blob \| commitdiff \| raw \| diff to current
2016-11-17	Junio C Hamano	Merge branch 'tk/diffcore-delta-remove-unused'	blob \| commitdiff \| raw \| diff to current
2016-11-17	Junio C Hamano	Merge branch 'nd/worktree-lock'	blob \| commitdiff \| raw \| diff to current
2016-11-11	Junio C Hamano	Merge branch 'ps/common-info-doc'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'nd/test-helpers'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'sc/fmt-merge-msg-doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'rs/commit-pptr-simplify'	blob \| commitdiff \| raw \| diff to current
2016-10-31	Junio C Hamano	Merge branch 'jk/rebase-config-insn-fmt-docfix'	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'rs/pretty-format-color-doc-fix' into...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'js/reset-usage' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'po/fix-doc-merge-base-illustration' into...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/tap-verbose-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/tighten-alloc' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/merge-base-fork-point-without-reflog...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'sb/submodule-config-doc-drop-path' into...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'nd/commit-p-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'jk/clone-copy-alternates-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'ak/curl-imap-send-explicit-scheme' into...	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'js/regexec-buf' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'rs/c-auto-resets-attributes' into maint	blob \| commitdiff \| raw \| diff to current
2016-10-28	Junio C Hamano	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| commitdiff \| raw \| diff to current
2016-10-27	Junio C Hamano	Merge branch 'jk/daemon-path-ok-check-truncation'	blob \| commitdiff \| raw \| diff to current
2016-10-27	Junio C Hamano	Merge branch 'sb/submodule-ignore-trailing-slash'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'po/fix-doc-merge-base-illustration'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/tap-verbose-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'mm/send-email-cc-cruft-after-address'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'yk/git-tag-remove-mention-of-old-layout...	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/tighten-alloc'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jk/merge-base-fork-point-without-reflog'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'mm/credential-libsecret'	blob \| commitdiff \| raw \| diff to current
2016-10-26	Junio C Hamano	Merge branch 'jc/ws-error-highlight'	blob \| commitdiff \| raw \| diff to current
2016-10-20	Junio C Hamano	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'sb/submodule-config-doc-drop-path'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'rs/pretty-format-color-doc-fix'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'js/reset-usage'	blob \| commitdiff \| raw \| diff to current
2016-10-17	Junio C Hamano	Merge branch 'js/regexec-buf'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom