Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
[gitweb.git] / combine-diff.c
2017-01-17 Merge branch 'jc/renormalize-merge-kill-safer-crlf...
2017-01-17 Merge branch 'da/mergetool-trust-exit-code' into maint
2017-01-17 Merge branch 'bw/push-dry-run' into maint
2017-01-17 Merge branch 'hv/submodule-not-yet-pushed-fix' into...
2017-01-17 Merge branch 'jk/rev-parse-symbolic-parents-fix' into...
2017-01-17 Merge branch 'js/mingw-isatty' into maint
2017-01-17 Merge branch 'bb/unicode-9.0' into maint
2016-12-05 Sync with maint-2.10
2016-12-05 Merge branch 'jk/common-main' into maint-2.10
2016-11-29 Merge branch 'tk/diffcore-delta-remove-unused' into...
2016-11-29 Merge branch 'jk/create-branch-remove-unused-param...
2016-11-29 Merge branch 'nd/worktree-lock' into maint
2016-11-29 Merge branch 'ps/common-info-doc' into maint
2016-11-29 Merge branch 'nd/test-helpers' into maint
2016-11-29 Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into...
2016-11-29 Merge branch 'rs/commit-pptr-simplify' into maint
2016-11-29 Merge branch 'jk/rebase-config-insn-fmt-docfix' into...
2016-11-29 Merge branch 'ak/pre-receive-hook-template-modefix...
2016-11-29 Merge branch 'ls/macos-update' into maint
2016-11-29 Merge branch 'jk/daemon-path-ok-check-truncation' into...
2016-11-29 Merge branch 'mm/send-email-cc-cruft-after-address...
2016-11-29 Merge branch 'cp/completion-negative-refs' into maint
2016-11-29 Merge branch 'jk/common-main'
2016-11-23 Merge branch 'jt/trailer-with-cruft'
2016-11-23 Merge branch 'js/rebase-i-commentchar-fix'
2016-11-23 Merge branch 'jc/for-each-ref-head-segfault-fix'
2016-11-22 Merge branch 'js/prepare-sequencer'
2016-11-17 Merge branch 'tk/diffcore-delta-remove-unused'
2016-11-17 Merge branch 'jk/create-branch-remove-unused-param'
2016-11-17 Merge branch 'nd/worktree-lock'
2016-11-11 Merge branch 'ps/common-info-doc'
2016-11-11 Merge branch 'ls/macos-update'
2016-11-11 Merge branch 'js/prepare-sequencer'
2016-11-11 Merge branch 'ls/filter-process'
2016-11-11 Merge branch 'as/merge-attr-sleep'
2016-11-10 Merge branch 'jk/alt-odb-cleanup'
2016-11-10 Merge branch 'jk/filter-process-fix'
2016-11-10 Merge branch 'ls/filter-process'
2016-11-02 Merge branch 'russian-l10n' of https://github.com/DJm00...
2016-11-01 Merge branch 'rs/cocci'
2016-10-31 Merge branch 'nd/test-helpers'
2016-10-31 Merge branch 'sc/fmt-merge-msg-doc-markup-fix'
2016-10-31 Merge branch 'ak/sh-setup-dot-source-i18n-fix'
2016-10-31 Merge branch 'rs/commit-pptr-simplify'
2016-10-31 Merge branch 'jk/rebase-config-insn-fmt-docfix'
2016-10-31 Merge branch 'ak/pre-receive-hook-template-modefix'
2016-10-31 Merge branch 'jk/common-main'
2016-10-31 Merge branch 'aw/numbered-stash'
2016-10-31 Merge branch 'jt/trailer-with-cruft'
2016-10-31 Merge branch 'ls/filter-process'
2016-10-31 Merge branch 'ls/git-open-cloexec'
2016-10-28 Sync with 2.10.2
2016-10-28 Merge branch 'pb/test-parse-options-expect' into maint
2016-10-28 Merge branch 'rs/pretty-format-color-doc-fix' into...
2016-10-28 Merge branch 'js/reset-usage' into maint
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 '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 'nd/commit-p-doc' into maint
2016-10-28 Merge branch 'jk/clone-copy-alternates-fix' 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 '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-cache' of git://bogomips.org/git-svn
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 'jk/no-looking-at-dotgit-outside-repo'
2016-10-26 diff_aligned_abbrev: use "struct oid"
2016-10-26 diff_unique_abbrev: rename to diff_aligned_abbrev
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 'tg/add-chmod+x-fix'
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 'mm/credential-libsecret'
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-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 'js/regexec-buf'
2016-10-17 Merge branch 'nd/commit-p-doc'
2016-10-17 Merge branch 'jk/clone-copy-alternates-fix'
2016-10-16 Merge branch 'russian-l10n' of https://github.com/DJm00...
2016-10-11 Merge branch 'jk/verify-packfile-gently' into maint
next