Merge branch 'sb/submodule-init' into next
[git] / mergetools /
2016-12-21  Junio C HamanoMerge branch 'nd/shallow-fixup'
2016-12-21  Junio C HamanoMerge branch 'sb/sequencer-abort-safety'
2016-12-21  Junio C HamanoMerge branch 'jk/difftool-in-subdir' into next
2016-12-21  Junio C HamanoMerge branch 'gv/p4-multi-path-commit-fix' into next
2016-12-21  Junio C HamanoMerge branch 'sb/submodule-embed-gitdir' into next
2016-12-21  Junio C HamanoMerge branch 'mk/mingw-winansi-ttyname-termination...
2016-12-21  Junio C HamanoMerge branch 'lt/shortlog-by-committer' into next
2016-12-21  Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into...
2016-12-20  Junio C HamanoMerge branch 'ld/p4-compare-dir-vs-symlink' into next
2016-12-20  Junio C HamanoMerge branch 'jt/mailinfo-fold-in-body-headers' into...
2016-12-19  Junio C HamanoMerge branch 'ls/filter-process' into next
2016-12-19  Junio C HamanoMerge branch 'lt/shortlog-by-committer' into next
2016-12-19  Junio C HamanoMerge branch 'jk/index-pack-wo-repo-from-stdin' into...
2016-12-19  Junio C HamanoMerge branch 'bw/transport-protocol-policy' into next
2016-12-19  Junio C HamanoMerge branch 'cp/merge-continue' into next
2016-12-19  Junio C HamanoMerge branch 'va/i18n-perl-scripts' into next
2016-12-19  Junio C HamanoMerge branch 'jk/parseopt-usage-msg-opt' into next
2016-12-19  Junio C HamanoMerge branch 'kh/tutorial-grammofix'
2016-12-19  Junio C HamanoMerge branch 'da/mergetool-xxdiff-hotkey'
2016-12-19  Junio C HamanoMerge branch 'lr/doc-fix-cet'
2016-12-19  Junio C HamanoMerge branch 'sb/t3600-cleanup'
2016-12-19  Junio C HamanoMerge branch 'jc/pull-rebase-ff'
2016-12-19  Junio C HamanoMerge branch 'ld/p4-worktree'
2016-12-19  Junio C HamanoMerge branch 'jk/make-tags-find-sources-tweak'
2016-12-19  Junio C HamanoMerge branch 'js/normalize-path-copy-ceil'
2016-12-19  Junio C HamanoMerge branch 'bb/unicode-9.0'
2016-12-19  Junio C HamanoMerge branch 'jk/readme-gmane-is-no-more'
2016-12-19  Junio C HamanoMerge branch 'jc/lock-report-on-error'
2016-12-19  Junio C HamanoMerge branch 'jk/xdiff-drop-xdl-fast-hash'
2016-12-19  Junio C HamanoMerge branch 'nd/rebase-forget'
2016-12-19  Junio C HamanoMerge branch 'jk/trailers-placeholder-in-pretty'
2016-12-19  Junio C HamanoMerge branch 'ak/commit-only-allow-empty'
2016-12-19  Junio C HamanoMerge branch 'da/difftool-dir-diff-fix'
2016-12-19  Junio C HamanoMerge branch 'jb/diff-no-index-no-abbrev'
2016-12-19  Junio C HamanoMerge branch 'rj/git-version-gen-do-not-force-abbrev'
2016-12-19  Junio C HamanoMerge branch 'jk/stash-disable-renames-internally'
2016-12-19  Junio C HamanoMerge branch 'jk/http-walker-limit-redirect'
2016-12-19  Junio C HamanoMerge branch 'jk/http-walker-limit-redirect-2.9'
2016-12-19  Junio C HamanoMerge branch 'nd/for-each-ref-ignore-case'
2016-12-19  Junio C HamanoMerge branch 'sb/unpack-trees-grammofix'
2016-12-19  Junio C HamanoMerge branch 'ls/travis-update-p4-and-lfs'
2016-12-19  Junio C HamanoMerge branch 'ls/t0021-fixup'
2016-12-19  Junio C HamanoMerge branch 'ah/grammos'
2016-12-19  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf'
2016-12-19  Junio C HamanoMerge branch 'jt/use-trailer-api-in-commands'
2016-12-16  Junio C HamanoSync with master
2016-12-16  Junio C HamanoMerge branch 'jk/make-tags-find-sources-tweak' into...
2016-12-16  Junio C HamanoMerge branch 'jk/readme-gmane-is-no-more' into next
2016-12-16  Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into...
2016-12-16  Junio C HamanoMerge branch 'jc/pull-rebase-ff' into next
2016-12-16  Junio C HamanoMerge branch 'ld/p4-worktree' into next
2016-12-16  Junio C HamanoMerge branch 'bb/unicode-9.0' into next
2016-12-16  Junio C HamanoMerge branch 'js/normalize-path-copy-ceil' into next
2016-12-16  Junio C HamanoMerge branch 'sb/sequencer-abort-safety' into next
2016-12-16  Junio C HamanoMerge branch 'ls/p4-retry-thrice'
2016-12-16  Junio C HamanoMerge branch 'ls/p4-empty-file-on-lfs'
2016-12-16  Junio C HamanoMerge branch 'ld/p4-update-shelve'
2016-12-16  Junio C HamanoMerge branch 'vk/p4-submit-shelve'
2016-12-16  Junio C HamanoMerge branch 'da/mergetool-trust-exit-code'
2016-12-14  Junio C HamanoSync with master
2016-12-14  Junio C HamanoMerge branch 'sb/t3600-cleanup' into next
2016-12-14  Junio C HamanoMerge branch 'lr/doc-fix-cet' into next
2016-12-14  Junio C HamanoMerge branch 'jk/xdiff-drop-xdl-fast-hash' into next
2016-12-14  Junio C HamanoMerge branch 'vs/submodule-clone-nested-submodules...
2016-12-14  Junio C HamanoMerge branch 'da/mergetool-xxdiff-hotkey' into next
2016-12-14  Junio C HamanoMerge branch 'kh/tutorial-grammofix' into next
2016-12-14  Junio C HamanoMerge branch 'nd/shallow-fixup' into next
2016-12-14  Junio C HamanoMerge branch 'sb/sequencer-abort-safety' into next
2016-12-14  Junio C HamanoMerge branch 'jc/lock-report-on-error' into next
2016-12-12  Junio C HamanoMerge branch 'ew/svn-fixes' into next
2016-12-12  Junio C HamanoMerge branch 'js/mingw-isatty' into next
2016-12-12  Junio C HamanoMerge branch 'rj/git-version-gen-do-not-force-abbrev...
2016-12-12  Junio C HamanoMerge branch 'ls/filter-process' into next
2016-12-12  Junio C HamanoMerge branch 'jk/stash-disable-renames-internally'...
2016-12-12  Junio C HamanoMerge branch 'da/difftool-dir-diff-fix' into next
2016-12-12  Junio C HamanoMerge branch 'jk/http-walker-limit-redirect' into next
2016-12-12  Junio C HamanoMerge branch 'jk/http-walker-limit-redirect-2.9' into...
2016-12-12  Junio C HamanoMerge branch 'nd/for-each-ref-ignore-case' into next
2016-12-12  Junio C HamanoMerge branch 'sb/unpack-trees-grammofix' into next
2016-12-12  Junio C HamanoMerge branch 'sb/t3600-cleanup' into next
2016-12-12  Junio C HamanoMerge branch 'ls/travis-update-p4-and-lfs' into next
2016-12-12  Junio C HamanoMerge branch 'ls/t0021-fixup' into next
2016-12-12  Junio C HamanoMerge branch 'ls/p4-retry-thrice' into next
2016-12-12  Junio C HamanoMerge branch 'ls/p4-empty-file-on-lfs' into next
2016-12-12  Junio C HamanoMerge branch 'ld/p4-update-shelve' into next
2016-12-12  Junio C HamanoMerge branch 'ak/commit-only-allow-empty' into next
2016-12-12  Junio C HamanoMerge branch 'ah/grammos' into next
2016-12-12  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf...
2016-12-12  Junio C HamanoMerge branch 'sb/push-make-submodule-check-the-default...
2016-12-12  Junio C HamanoMerge branch 'vk/p4-submit-shelve' into next
2016-12-12  Junio C HamanoMerge branch 'jb/diff-no-index-no-abbrev' into next
2016-12-12  Junio C HamanoMerge branch 'da/mergetool-trust-exit-code' into next
2016-12-12  Junio C HamanoMerge branch 'nd/rebase-forget' into next
2016-12-12  David Aguilarmergetools: fix xxdiff hotkeys
2016-12-05  Junio C HamanoMerge branch 'jc/latin-1' into next
2016-12-05  Junio C HamanoMerge branch 'mm/gc-safety-doc' into next
2016-12-05  Junio C HamanoMerge branch 'mm/push-social-engineering-attack-doc...
2016-12-05  Junio C HamanoMerge branch 'jt/fetch-no-redundant-tag-fetch-map'...
2016-12-05  Junio C HamanoMerge branch 'jc/push-default-explicit' into next
2016-12-05  Junio C HamanoMerge branch 'jc/merge-drop-old-syntax' into next
next