Merge tag 'v2.10.4' into maint-2.11
[gitweb.git] / git-gui / lib / merge.tcl
2016-10-28 Merge branch 'po/fix-doc-merge-base-illustration' into...
2016-10-28 Merge branch 'jk/tap-verbose-fix' into maint
2016-10-28 Merge branch 'tg/add-chmod+x-fix' into maint
2016-10-28 Merge branch 'bw/submodule-branch-dot-doc' into maint
2016-10-28 Merge branch 'jk/tighten-alloc' into maint
2016-10-28 Merge branch 'jk/fetch-quick-tag-following' into maint
2016-10-28 Merge branch 'jk/merge-base-fork-point-without-reflog...
2016-10-28 Merge branch 'sb/submodule-config-doc-drop-path' into...
2016-10-28 Merge branch 'jk/ref-symlink-loop' into maint
2016-10-28 Merge branch 'nd/commit-p-doc' into maint
2016-10-28 Merge branch 'jk/clone-copy-alternates-fix' into maint
2016-10-28 Merge branch 'dt/http-empty-auth' into maint
2016-10-28 Merge branch 'dp/autoconf-curl-ssl' into maint
2016-10-28 Merge branch 'ak/curl-imap-send-explicit-scheme' into...
2016-10-28 Merge branch 'jt/fetch-pack-in-vain-count-with-stateles...
2016-10-28 Merge branch 'js/regexec-buf' into maint
2016-10-28 Merge branch 'rs/c-auto-resets-attributes' into maint
2016-10-28 Merge branch 'yk/git-tag-remove-mention-of-old-layout...
2016-10-27 Merge branch 'svn-wt' of git://bogomips.org/git-svn
2016-10-27 Merge branch 'nd/ita-empty-commit'
2016-10-27 Merge branch 'js/prepare-sequencer'
2016-10-27 Merge branch 'jk/daemon-path-ok-check-truncation'
2016-10-27 Merge branch 'rs/ring-buffer-wraparound'
2016-10-27 Merge branch 'sb/submodule-ignore-trailing-slash'
2016-10-27 Merge branch 'jc/abbrev-auto'
2016-10-27 Merge branch 'jk/abbrev-auto'
2016-10-27 Merge branch 'lt/abbrev-auto'
2016-10-26 Merge branch 'ex/deprecate-empty-pathspec-as-match...
2016-10-26 Merge branch 'po/fix-doc-merge-base-illustration'
2016-10-26 Merge branch 'jk/tap-verbose-fix'
2016-10-26 Merge branch 'mm/send-email-cc-cruft-after-address'
2016-10-26 Merge branch 'yk/git-tag-remove-mention-of-old-layout...
2016-10-26 Merge branch 'pt/gitgui-updates'
2016-10-26 Merge branch 'jk/diff-submodule-diff-inline'
2016-10-26 Merge branch 'tg/add-chmod+x-fix'
2016-10-26 Merge branch 'bw/submodule-branch-dot-doc'
2016-10-26 Merge branch 'pb/test-parse-options-expect'
2016-10-26 Merge branch 'jk/tighten-alloc'
2016-10-26 Merge branch 'jk/fetch-quick-tag-following'
2016-10-26 Merge branch 'jk/merge-base-fork-point-without-reflog'
2016-10-26 Merge branch 'jk/ambiguous-short-object-names'
2016-10-26 Merge branch 'ab/gitweb-abbrev-links'
2016-10-26 Merge branch 'mg/gpg-richer-status'
2016-10-26 Merge branch 'mm/credential-libsecret'
2016-10-26 Merge branch 'bw/ls-files-recurse-submodules'
2016-10-26 Merge branch 'js/libify-require-clean-work-tree'
2016-10-26 Merge branch 'jc/ws-error-highlight'
2016-10-26 Merge branch 'jc/diff-unique-abbrev-comments'
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-10-17 Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com...
2016-10-17 Merge branch 'sb/submodule-config-doc-drop-path'
2016-10-17 Merge branch 'rs/pretty-format-color-doc-fix'
2016-10-17 Merge branch 'js/reset-usage'
2016-10-17 Merge branch 'rs/cocci'
2016-10-17 Merge branch 'js/regexec-buf'
2016-10-17 Merge branch 'jk/ref-symlink-loop'
2016-10-17 Merge branch 'nd/commit-p-doc'
2016-10-17 Merge branch 'jk/clone-copy-alternates-fix'
2016-10-17 Merge branch 'dt/http-empty-auth'
2016-10-11 Merge branch 'jk/verify-packfile-gently' into maint
2016-10-11 Merge branch 'jc/worktree-config' into maint
2016-10-11 Merge branch 'jc/verify-loose-object-header' into maint
2016-10-11 Merge branch 'rs/git-gui-use-modern-git-merge-syntax...
2016-10-10 Merge branch 'jc/blame-reverse'
2016-10-10 Merge branch 'nd/shallow-deepen'
2016-10-10 Merge branch 'cp/completion-negative-refs'
2016-10-10 Merge branch 'dp/autoconf-curl-ssl'
2016-10-10 Merge branch 'ak/curl-imap-send-explicit-scheme'
2016-10-10 Merge branch 'jk/pack-objects-optim-mru'
2016-10-10 Merge branch 'rs/qsort'
2016-10-06 Merge branch 'sg/ref-filter-parse-optim'
2016-10-06 Merge branch 'rs/cocci'
2016-10-06 Merge branch 'rs/c-auto-resets-attributes'
2016-10-06 Merge branch 'ps/http-gssapi-cred-delegation'
2016-10-06 Merge branch 'jk/graph-padding-fix'
2016-10-06 Merge branch 'vn/revision-shorthand-for-side-branch...
2016-10-06 Merge branch 'jc/blame-abbrev'
2016-10-06 Merge branch 'jk/ambiguous-short-object-names'
2016-10-03 Sync with 2.10.1
2016-10-03 Merge branch 'pb/rev-list-reverse-with-count'
2016-10-03 Merge branch 'dt/tree-fsck'
2016-10-03 Merge branch 'kd/mailinfo-quoted-string'
2016-10-03 Merge branch 'mh/diff-indent-heuristic'
2016-10-03 Merge branch 'dt/mailinfo'
2016-10-03 Merge branch 'va/git-gui-i18n'
2016-10-03 Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18 Merge branch 'rn/glossary-typofix' into HEAD
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
next