Merge branch 'bc/object-id'
[gitweb.git] / mergetools / diffmerge
2017-01-10 Merge branch 'dt/smart-http-detect-server-going-away'
2017-01-10 Merge branch 'mm/gc-safety-doc'
2017-01-10 Merge branch 'mm/push-social-engineering-attack-doc'
2017-01-10 Merge branch 'jt/fetch-no-redundant-tag-fetch-map'
2017-01-10 Merge branch 'jc/latin-1'
2017-01-02 Merge branch 'master' of https://github.com/Softcatala...
2016-12-27 Merge branch 'jc/lock-report-on-error'
2016-12-27 Merge branch 'js/mingw-isatty'
2016-12-27 Merge branch 'ls/p4-lfs'
2016-12-27 Merge branch 'va/i18n-even-more'
2016-12-27 Merge branch 'lt/shortlog-by-committer'
2016-12-27 Merge branch 'mk/mingw-winansi-ttyname-termination...
2016-12-27 Merge branch 'gv/p4-multi-path-commit-fix'
2016-12-27 Merge branch 'jk/difftool-in-subdir'
2016-12-27 Merge branch 'ld/p4-compare-dir-vs-symlink'
2016-12-27 Merge branch 'ls/filter-process'
2016-12-27 Merge branch 'bw/transport-protocol-policy'
2016-12-27 Merge branch 'cp/merge-continue'
2016-12-27 Merge branch 'va/i18n-perl-scripts'
2016-12-27 Merge branch 'sb/submodule-config-cleanup'
2016-12-27 Merge branch 'jc/push-default-explicit'
2016-12-21 Merge branch 'jt/mailinfo-fold-in-body-headers'
2016-12-21 Merge branch 'jk/index-pack-wo-repo-from-stdin'
2016-12-21 Merge branch 'jk/parseopt-usage-msg-opt'
2016-12-21 Merge branch 'jk/quote-env-path-list-component'
2016-12-21 Merge branch 'vs/submodule-clone-nested-submodules...
2016-12-21 Merge branch 'nd/shallow-fixup'
2016-12-21 Merge branch 'sb/sequencer-abort-safety'
2016-12-19 Merge branch 'kh/tutorial-grammofix'
2016-12-19 Merge branch 'da/mergetool-xxdiff-hotkey'
2016-12-19 Merge branch 'lr/doc-fix-cet'
2016-12-19 Merge branch 'sb/t3600-cleanup'
2016-12-19 Merge branch 'jc/pull-rebase-ff'
2016-12-19 Merge branch 'ld/p4-worktree'
2016-12-19 Merge branch 'jk/make-tags-find-sources-tweak'
2016-12-19 Merge branch 'js/normalize-path-copy-ceil'
2016-12-19 Merge branch 'bb/unicode-9.0'
2016-12-19 Merge branch 'jk/readme-gmane-is-no-more'
2016-12-19 Merge branch 'jc/lock-report-on-error'
2016-12-19 Merge branch 'jk/xdiff-drop-xdl-fast-hash'
2016-12-19 Merge branch 'nd/rebase-forget'
2016-12-19 Merge branch 'jk/trailers-placeholder-in-pretty'
2016-12-19 Merge branch 'ak/commit-only-allow-empty'
2016-12-19 Merge branch 'da/difftool-dir-diff-fix'
2016-12-19 Merge branch 'jb/diff-no-index-no-abbrev'
2016-12-19 Merge branch 'rj/git-version-gen-do-not-force-abbrev'
2016-12-19 Merge branch 'jk/stash-disable-renames-internally'
2016-12-19 Merge branch 'jk/http-walker-limit-redirect'
2016-12-19 Merge branch 'jk/http-walker-limit-redirect-2.9'
2016-12-19 Merge branch 'nd/for-each-ref-ignore-case'
2016-12-19 Merge branch 'sb/unpack-trees-grammofix'
2016-12-19 Merge branch 'ls/travis-update-p4-and-lfs'
2016-12-19 Merge branch 'ls/t0021-fixup'
2016-12-19 Merge branch 'ah/grammos'
2016-12-19 Merge branch 'jc/renormalize-merge-kill-safer-crlf'
2016-12-19 Merge branch 'jt/use-trailer-api-in-commands'
2016-12-16 Merge branch 'ls/p4-retry-thrice'
2016-12-16 Merge branch 'ls/p4-empty-file-on-lfs'
2016-12-16 Merge branch 'ld/p4-update-shelve'
2016-12-16 Merge branch 'vk/p4-submit-shelve'
2016-12-16 Merge branch 'da/mergetool-trust-exit-code'
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-07-06 Merge branch 'ap/git-svn-propset-doc' into maint
2016-06-27 Merge branch 'ap/git-svn-propset-doc'
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/dir-exclude-cleanup' 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'
next