Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint
[gitweb.git] / mergetools / vimdiff3
2014-09-11 Merge branch 'rs/list-optim'
2014-09-11 Merge branch 'jk/fast-import-fixes'
2014-09-11 Merge branch 'jk/prune-top-level-refs-after-packing'
2014-09-11 Merge branch 'dt/cache-tree-repair'
2014-09-11 Merge branch 'et/spell-poll-infinite-with-minus-one...
2014-09-11 Merge branch 'br/http-init-fix'
2014-09-09 Merge branch 'sp/pack-protocol-doc-on-shallow'
2014-09-09 Merge branch 'jk/prompt-stash-could-be-packed'
2014-09-09 Merge branch 'tb/pretty-format-cd-date-format'
2014-09-09 Merge branch 'rs/inline-compat-path-macros'
2014-09-09 Merge branch 'rs/clean-menu-item-defn'
2014-09-09 Merge branch 'jc/config-mak-document-darwin-vs-macosx'
2014-09-09 Merge branch 'sb/mailsplit-dead-code-removal'
2014-09-09 Merge branch 'so/rebase-doc'
2014-09-09 Merge branch 'sb/prepare-revision-walk-error-check'
2014-09-09 Merge branch 'sb/blame-msg-i18n'
2014-09-09 Merge branch 'nd/strbuf-utf8-replace'
2014-09-09 Merge branch 'sb/plug-leaks'
2014-09-09 Merge branch 'rs/refresh-beyond-symlink'
2014-09-09 Merge branch 'jk/stash-list-p'
2014-09-09 Merge branch 'mm/log-branch-desc-plug-leak'
2014-09-09 Merge branch 'lf/bundle-exclusion'
2014-09-09 Merge branch 'jc/apply-ws-prefix'
2014-09-09 Merge branch 'jk/command-line-config-empty-string'
2014-09-09 Merge branch 'bc/imap-send-doc'
2014-09-02 Merge branch 'rs/strbuf-getcwd'
2014-09-02 Merge branch 'ta/pretty-parse-config'
2014-09-02 Merge branch 'bc/archive-pax-header-mode'
2014-09-02 Merge branch 'rs/init-no-duplicate-real-path'
2014-09-02 Merge branch 'mm/config-edit-global'
2014-09-02 Merge branch 'jc/reopen-lock-file'
2014-08-26 Merge branch 'jk/diff-tree-t-fix'
2014-08-26 Merge branch 'jk/pack-shallow-always-without-bitmap'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-08-04 Merge branch 'tf/maint-doc-push'
2014-08-04 Merge branch 'ta/doc-config'
2014-07-30 Sync with 2.0.4
2014-07-30 Merge branch 'jk/more-push-completion'
2014-07-28 Merge branch 'maint'
2014-07-28 Merge branch 'jk/misc-fixes-maint'
2014-07-23 Sync with v2.0.3
2014-07-23 Merge branch 'rs/fix-unlink-unix-socket'
2014-07-22 Sync with maint
2014-07-21 Merge branch 'maint'
2014-07-21 Merge branch 'rs/unify-is-branch'
2014-07-21 Merge branch 'kb/avoid-fchmod-for-now'
2014-07-21 Merge branch 'ek/alt-odb-entry-fix'
2014-07-21 Merge branch 'jk/remote-curl-squelch-extra-errors'
2014-07-16 Sync with 2.0.2
2014-07-16 Merge branch 'ah/fix-http-push'
2014-07-16 Merge branch 'po/error-message-style'
2014-07-16 Merge branch 'zk/log-graph-showsig'
2014-07-16 Merge branch 'mg/fix-log-mergetag-color'
2014-07-16 Merge branch 'kb/path-max-must-go'
2014-07-16 Merge branch 'cb/filter-branch-prune-empty-degenerate...
2014-07-16 Merge branch 'jk/strip-suffix'
2014-07-16 Merge branch 'jk/replace-edit-raw'
2014-07-16 Merge branch 'cc/replace-edit'
2014-07-16 Merge branch 'nd/split-index'
2014-07-10 Merge branch 'maint'
2014-07-10 Merge branch 'rs/fix-alt-odb-path-comparison'
2014-07-10 Merge branch 'rs/status-code-clean-up'
2014-07-10 Merge branch 'kb/path-max-must-go'
2014-07-10 Merge branch 'jc/fix-clone-single-starting-at-a-tag'
2014-07-09 Merge branch 'sk/mingw-unicode-spawn-args'
2014-07-09 Merge branch 'sk/mingw-dirent'
2014-07-09 Merge branch 'sk/mingw-uni-console'
2014-07-09 Merge branch 'sk/mingw-main'
2014-07-09 Merge branch 'jk/pretty-G-format-fixes'
2014-07-02 Merge branch 'ye/http-extract-charset'
2014-07-02 Merge branch 'bc/fix-rebase-merge-skip'
2014-07-02 Merge branch 'jk/commit-buffer-length'
2014-07-02 Merge branch 'maint'
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-06-25 Sync with maint
2014-06-25 Merge branch 'tb/unicode-7.0-display-width'
2014-06-25 Merge branch 'ye/doc-http-proto'
2014-06-25 Merge branch 'rs/blame-refactor'
2014-06-25 Merge branch 'pb/trim-trailing-spaces'
2014-06-25 Merge branch 'mc/doc-submodule-sync-recurse'
2014-06-25 Merge branch 'sp/complete-ext-alias'
2014-06-25 Merge branch 'mc/git-p4-prepare-p4-only'
2014-06-25 Merge branch 'jk/repack-pack-writebitmaps-config'
2014-06-25 Merge branch 'nd/init-restore-env'
2014-06-25 Merge branch 'jk/repack-pack-keep-objects'
2014-06-25 Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'
2014-06-20 Merge branch 'jc/test-lazy-prereq' (early part)
2014-06-20 Merge branch 'jc/fetch-pull-refmap'
2014-06-20 Merge branch 'mt/send-email-cover-to-cc'
2014-06-20 Merge branch 'tb/t5551-clone-notice-to-stderr'
2014-06-20 Merge branch 'rs/more-starts-with'
2014-06-20 Merge branch 'jm/api-strbuf-doc'
2014-06-20 Merge branch 'jc/revision-dash-count-parsing'
2014-06-16 Merge branch 'ib/test-selectively-run'
2014-06-16 Merge branch 'ta/string-list-init'
2014-06-16 Merge branch 'jm/dedup-test-config'
2014-06-16 Merge branch 'sk/test-cmp-bin'
2014-06-16 Merge branch 'sh/enable-preloadindex'
next