Merge branch 'mh/fast-import-notes-fix-new' into maint
[gitweb.git] / mergetools / vimdiff
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
2017-01-17 Merge branch 'bb/unicode-9.0' into maint
2016-11-29 Merge branch 'mm/send-email-cc-cruft-after-address...
2016-11-29 mergetools/vimdiff: trust Vim's exit code
2016-11-29 mergetool: honor mergetool.$tool.trustExitCode for...
2016-10-28 Merge branch 'jk/tighten-alloc' into maint
2016-10-26 Merge branch 'mm/send-email-cc-cruft-after-address'
2016-10-26 Merge branch 'jk/tighten-alloc'
2016-10-26 Merge branch 'jc/ws-error-highlight'
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-10-11 Merge branch 'jc/verify-loose-object-header' into maint
2016-10-03 Merge branch 'jc/verify-loose-object-header'
2016-09-29 Merge branch 'ls/travis-homebrew-path-fix' into maint
2016-09-29 Merge branch 'jk/reduce-gc-aggressive-depth' into maint
2016-09-29 Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-29 Merge branch 'mr/vcs-svn-printf-ulong' into maint
2016-09-26 Merge branch 'ls/travis-homebrew-path-fix'
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 'jk/reduce-gc-aggressive-depth'
2016-09-21 Merge branch 'mr/vcs-svn-printf-ulong'
2016-09-21 Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-19 Merge branch 'po/range-doc' into maint
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'po/range-doc'
2016-09-09 Merge branch 'rs/mailinfo-lib' into maint
2016-09-09 Merge branch 'jk/tighten-alloc' into maint
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-09 Merge branch 'js/import-tars-hardlinks' into maint
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-08-17 Merge branch 'rs/mailinfo-lib'
2016-08-17 Merge branch 'jk/tighten-alloc'
2016-08-12 Merge branch 'js/import-tars-hardlinks'
2016-08-10 Merge branch 'js/commit-slab-decl-fix'
2016-08-10 Merge branch 'cp/completion-clone-recurse-submodules...
2016-08-10 Merge branch 'jc/hashmap-doc-init' into maint
2016-08-10 Merge branch 'js/t4130-rename-without-ino' into maint
2016-08-10 Merge branch 'jc/grep-commandline-vs-configuration...
2016-08-10 Merge branch 'pm/build-persistent-https-with-recent...
2016-08-10 Merge branch 'os/no-verify-skips-commit-msg-too' into...
2016-08-10 Merge branch 'ew/autoconf-pthread' into maint
2016-08-10 Merge branch 'mm/status-suggest-merge-abort' into maint
2016-08-08 Merge branch 'jc/hashmap-doc-init'
2016-08-08 Merge branch 'jk/parseopt-string-list'
2016-08-08 Merge branch 'nd/log-decorate-color-head-arrow'
2016-08-08 Merge branch 'cp/completion-clone-recurse-submodules'
2016-08-08 Merge branch 'js/t4130-rename-without-ino'
2016-08-08 Merge branch 'sb/pack-protocol-doc-nak' into maint
2016-08-08 Merge branch 'jc/doc-diff-filter-exclude' into maint
2016-08-08 Merge branch 'rs/use-strbuf-addbuf' into maint
2016-08-08 Merge branch 'lf/recv-sideband-cleanup' into maint
2016-08-08 Merge branch 'js/ignore-space-at-eol' into maint
2016-08-08 Merge branch 'jk/push-scrub-url' into maint
2016-08-04 Merge branch 'jc/grep-commandline-vs-configuration'
2016-08-04 Merge branch 'sb/pack-protocol-doc-nak'
2016-08-03 Merge branch 'jk/git-jump'
2016-08-03 Merge branch 'mm/status-suggest-merge-abort'
2016-08-03 Merge branch 'pm/build-persistent-https-with-recent-go'
2016-08-03 Merge branch 'os/no-verify-skips-commit-msg-too'
2016-07-28 Merge branch 'nd/icase' into maint
next