Merge branch 'jk/archive-zip-userdiff-config' into maint
[gitweb.git] / mergetools / bc
2017-01-31 Merge branch 'jk/archive-zip-userdiff-config' into...
2017-01-31 Merge branch 'dt/disable-bitmap-in-auto-gc' into maint
2017-01-31 Merge branch 'nd/config-misc-fixes' into maint
2017-01-31 Merge branch 'jc/abbrev-autoscale-config' into maint
2017-01-31 Merge branch 'mh/fast-import-notes-fix-new' into maint
2017-01-31 Merge branch 'jc/compression-config' into maint
2017-01-31 Merge branch 'ew/svn-fixes' into maint
2017-01-31 Merge branch 'jk/make-tags-find-sources-tweak' into...
2017-01-31 Merge branch 'jc/latin-1' into maint
2017-01-17 Merge branch 'mm/gc-safety-doc' into maint
2017-01-17 Merge branch 'mm/push-social-engineering-attack-doc...
2017-01-17 Merge branch 'jt/fetch-no-redundant-tag-fetch-map'...
2017-01-17 Merge branch 'ls/filter-process' into maint
2017-01-17 Merge branch 'kh/tutorial-grammofix' into maint
2017-01-17 Merge branch 'lr/doc-fix-cet' into maint
2017-01-17 Merge branch 'sb/t3600-cleanup' into maint
2017-01-17 Merge branch 'jk/readme-gmane-is-no-more' into maint
2017-01-17 Merge branch 'sb/unpack-trees-grammofix' into maint
2017-01-17 Merge branch 'ls/t0021-fixup' into maint
2017-01-17 Merge branch 'ak/lazy-prereq-mktemp' into maint
2017-01-17 Merge branch 'nd/qsort-in-merge-recursive' into maint
2017-01-17 Merge branch 'dt/smart-http-detect-server-going-away...
2017-01-17 Merge branch 'mk/mingw-winansi-ttyname-termination...
2017-01-17 Merge branch 'gv/p4-multi-path-commit-fix' into maint
2017-01-17 Merge branch 'jk/difftool-in-subdir' into maint
2017-01-17 Merge branch 'ld/p4-compare-dir-vs-symlink' into maint
2017-01-17 Merge branch 'jc/push-default-explicit' into maint
2017-01-17 Merge branch 'jt/mailinfo-fold-in-body-headers' into...
2017-01-17 Merge branch 'jk/index-pack-wo-repo-from-stdin' into...
2017-01-17 Merge branch 'jk/parseopt-usage-msg-opt' into maint
2017-01-17 Merge branch 'jk/quote-env-path-list-component' into...
2017-01-17 Merge branch 'nd/shallow-fixup' into maint
2017-01-17 Merge branch 'sb/sequencer-abort-safety' into maint
2017-01-17 Merge branch 'da/mergetool-xxdiff-hotkey' into maint
2017-01-17 Merge branch 'jc/pull-rebase-ff' into maint
2017-01-17 Merge branch 'js/normalize-path-copy-ceil' into maint
2017-01-17 Merge branch 'ak/commit-only-allow-empty' into maint
2017-01-17 Merge branch 'da/difftool-dir-diff-fix' into maint
2017-01-17 Merge branch 'jb/diff-no-index-no-abbrev' into maint
2017-01-17 Merge branch 'jk/stash-disable-renames-internally'...
2017-01-17 Merge branch 'jk/http-walker-limit-redirect' into maint
2017-01-17 Merge branch 'jc/renormalize-merge-kill-safer-crlf...
2017-01-17 Merge branch 'ls/p4-empty-file-on-lfs' into maint
2017-01-17 Merge branch 'da/mergetool-trust-exit-code' into maint
2016-11-29 mergetool: honor mergetool.$tool.trustExitCode for...
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-29 Merge branch 'mr/vcs-svn-printf-ulong' into maint
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-21 Merge branch 'mr/vcs-svn-printf-ulong'
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-08-03 Merge branch 'jk/git-jump'
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-07-11 Merge branch 'cb/t7810-test-label-fix' into maint
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-06-03 Merge branch 'pa/cherry-pick-doc-typo'
2016-05-30 Merge branch 'rj/log-decorate-auto'
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-05-02 Merge branch 'ad/cygwin-wants-rename' into maint
2016-04-22 Merge branch 'ad/cygwin-wants-rename'
2016-04-03 Merge branch 'jc/maint-index-pack-keep'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-03 Merge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-22 Merge branch 'jk/config-include'
2016-02-05 Merge branch 'ss/clone-depth-single-doc' into maint
2016-02-05 Merge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05 Merge branch 'ew/for-each-ref-doc' into maint
2016-02-05 Merge branch 'ss/user-manual' into maint
2016-02-05 Merge branch 'jk/sanity' into maint
2016-02-05 Merge branch 'nd/stop-setenv-work-tree' into maint
2016-01-29 Merge branch 'jk/sanity'
2016-01-20 Merge branch 'ss/clone-depth-single-doc'
2016-01-20 Merge branch 'sg/t6050-failing-editor-test-fix'
2016-01-20 Merge branch 'ew/for-each-ref-doc'
2016-01-20 Merge branch 'ss/user-manual'
2016-01-20 Merge branch 'jk/pack-revindex'
2016-01-12 Merge branch 'nd/stop-setenv-work-tree'
2016-01-04 Merge branch 'jk/pending-keep-tag-name' into maint
2015-12-28 Merge branch 'jk/pending-keep-tag-name'
2015-12-22 Merge branch 'nd/stop-setenv-work-tree' into nd/clear...
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-12-15 Merge branch 'jk/prune-mtime' into maint
2015-12-15 Merge branch 'jk/prune-mtime'
2015-12-01 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05 Merge branch 'jc/add-u-A-default-to-top' into maint
2015-11-04 Merge branch 'xf/user-manual-ff' into maint
2015-11-04 Merge branch 'xf/user-manual-markup' into maint
2015-11-04 Merge branch 'jc/everyday-markup' into maint
2015-11-03 Merge branch 'jk/merge-file-exit-code' into maint
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
next