Merge branch 'ls/p4-empty-file-on-lfs' into maint
[git] / Documentation / git-merge-base.txt
2017-01-17  Junio C HamanoMerge branch 'bw/push-dry-run' into maint
2017-01-17  Junio C HamanoMerge branch 'hv/submodule-not-yet-pushed-fix' into...
2017-01-17  Junio C HamanoMerge branch 'jk/rev-parse-symbolic-parents-fix' into...
2017-01-17  Junio C HamanoMerge branch 'bb/unicode-9.0' into maint
2016-12-05  Junio C HamanoMerge branch 'jk/common-main' into maint-2.10
2016-11-29  Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused' into...
2016-11-29  Junio C HamanoMerge branch 'jk/create-branch-remove-unused-param...
2016-11-29  Junio C HamanoMerge branch 'nd/worktree-lock' into maint
2016-11-29  Junio C HamanoMerge branch 'ps/common-info-doc' into maint
2016-11-29  Junio C HamanoMerge branch 'nd/test-helpers' into maint
2016-11-29  Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix' into...
2016-11-29  Junio C HamanoMerge branch 'rs/commit-pptr-simplify' into maint
2016-11-29  Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix' into...
2016-11-29  Junio C HamanoMerge branch 'ak/pre-receive-hook-template-modefix...
2016-11-29  Junio C HamanoMerge branch 'ls/macos-update' into maint
2016-11-29  Junio C HamanoMerge branch 'as/merge-attr-sleep' into maint
2016-11-29  Junio C HamanoMerge branch 'jk/daemon-path-ok-check-truncation' into...
2016-11-29  Junio C HamanoMerge branch 'rs/ring-buffer-wraparound' into maint
2016-11-29  Junio C HamanoMerge branch 'mm/send-email-cc-cruft-after-address...
2016-11-29  Junio C HamanoMerge branch 'cp/completion-negative-refs' into maint
2016-11-29  Junio C HamanoMerge branch 'jc/am-read-author-file' into maint
2016-11-29  Junio C HamanoMerge branch 'jk/common-main'
2016-11-23  Junio C HamanoMerge branch 'jt/trailer-with-cruft'
2016-11-23  Junio C HamanoMerge branch 'js/rebase-i-commentchar-fix'
2016-11-23  Junio C HamanoMerge branch 'jc/for-each-ref-head-segfault-fix'
2016-11-22  Junio C HamanoMerge branch 'js/prepare-sequencer'
2016-11-17  Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused'
2016-11-17  Junio C HamanoMerge branch 'jk/create-branch-remove-unused-param'
2016-11-17  Junio C HamanoMerge branch 'nd/worktree-lock'
2016-11-11  Junio C HamanoMerge branch 'ps/common-info-doc'
2016-11-11  Junio C HamanoMerge branch 'ls/macos-update'
2016-11-11  Junio C HamanoMerge branch 'js/prepare-sequencer'
2016-11-11  Junio C HamanoMerge branch 'ls/filter-process'
2016-11-11  Junio C HamanoMerge branch 'as/merge-attr-sleep'
2016-11-10  Junio C HamanoMerge branch 'jk/alt-odb-cleanup'
2016-11-10  Junio C HamanoMerge branch 'jk/filter-process-fix'
2016-11-10  Junio C HamanoMerge branch 'ls/filter-process'
2016-11-02  Jiang XinMerge branch 'russian-l10n' of https://github.com/DJm00...
2016-10-31  Junio C HamanoMerge branch 'nd/test-helpers'
2016-10-31  Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix'
2016-10-31  Junio C HamanoMerge branch 'rs/commit-pptr-simplify'
2016-10-31  Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix'
2016-10-31  Junio C HamanoMerge branch 'ak/pre-receive-hook-template-modefix'
2016-10-31  Junio C HamanoMerge branch 'jk/common-main'
2016-10-31  Junio C HamanoMerge branch 'aw/numbered-stash'
2016-10-31  Junio C HamanoMerge branch 'jt/trailer-with-cruft'
2016-10-31  Junio C HamanoMerge branch 'ls/filter-process'
2016-10-31  Junio C HamanoMerge branch 'ls/git-open-cloexec'
2016-10-28  Junio C HamanoMerge branch 'pb/test-parse-options-expect' into maint
2016-10-28  Junio C HamanoMerge branch 'jc/cocci-xstrdup-or-null' into maint
2016-10-28  Junio C HamanoMerge branch 'rs/cocci' into maint
2016-10-28  Junio C HamanoMerge branch 'jc/diff-unique-abbrev-comments' into...
2016-10-28  Junio C HamanoMerge branch 'rs/pretty-format-color-doc-fix' into...
2016-10-28  Junio C HamanoMerge branch 'js/reset-usage' into maint
2016-10-28  Junio C HamanoMerge branch 'po/fix-doc-merge-base-illustration' into...
2016-10-27  Junio C HamanoMerge branch 'svn-wt' of git://bogomips.org/git-svn
2016-10-27  Junio C HamanoMerge branch 'nd/ita-empty-commit'
2016-10-27  Junio C HamanoMerge branch 'js/prepare-sequencer'
2016-10-27  Junio C HamanoMerge branch 'jk/daemon-path-ok-check-truncation'
2016-10-27  Junio C HamanoMerge branch 'rs/ring-buffer-wraparound'
2016-10-27  Junio C HamanoMerge branch 'sb/submodule-ignore-trailing-slash'
2016-10-27  Junio C HamanoMerge branch 'jc/abbrev-auto'
2016-10-27  Junio C HamanoMerge branch 'jk/abbrev-auto'
2016-10-27  Junio C HamanoMerge branch 'lt/abbrev-auto'
2016-10-26  Junio C HamanoMerge branch 'ex/deprecate-empty-pathspec-as-match...
2016-10-26  Junio C HamanoMerge branch 'po/fix-doc-merge-base-illustration'
2016-10-21  Philip Oakleydoc: fix merge-base ASCII art tab spacing
2016-10-20  Junio C HamanoMerge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26  Junio C HamanoMerge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26  Junio C HamanoMerge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui
2016-08-31  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix'
2016-08-03  Junio C HamanoMerge branch 'jk/git-jump'
2016-07-28  Junio C HamanoMerge branch 'js/t3404-grammo-fix' into maint
2016-07-13  Junio C HamanoMerge branch 'js/t3404-grammo-fix'
2016-07-11  Junio C HamanoMerge branch 'cb/t7810-test-label-fix' into maint
2016-07-06  Junio C HamanoMerge branch 'cb/t7810-test-label-fix'
2016-05-26  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18  Junio C HamanoMerge branch 'rn/glossary-typofix' into HEAD
2016-05-17  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix'
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix'
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-14  Junio C HamanoMerge branch 'mg/wt-status-mismarked-i18n'
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix'
2015-09-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix'
2015-09-17  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' into...
2015-09-17  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test'
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix'
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
next