Merge branch 'jk/merge-file-exit-code'
[gitweb.git] / xdiff-interface.c
2015-10-30 Merge branch 'jk/merge-file-exit-code'
2015-10-30 Merge branch 'gr/rebase-i-drop-warn'
2015-10-30 Merge branch 'xf/user-manual-ff'
2015-10-30 Merge branch 'mk/blame-error-message'
2015-10-30 Merge branch 'js/misc-fixes'
2015-10-30 Merge branch 'jk/delete-modechange-conflict'
2015-10-30 Merge branch 'jc/add-u-A-default-to-top'
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-29 Merge branch 'rp/link-curl-before-ssl'
2015-10-29 Merge branch 'dt/name-hash-dir-entry-fix'
2015-10-29 Merge branch 'tk/sigchain-unnecessary-post-tempfile'
2015-10-29 Merge branch 'jk/war-on-sprintf'
2015-10-29 Merge branch 'jc/em-dash-in-doc'
2015-10-29 Merge branch 'jc/everyday-markup'
2015-10-29 Merge branch 'xf/user-manual-markup'
2015-10-26 Merge branch 'dk/p4-import-ctypes'
2015-10-26 Merge branch 'jk/repository-extension'
2015-10-26 Merge branch 'dt/t7063-fix-flaky-test'
2015-10-26 Merge branch 'kn/for-each-tag'
2015-10-26 Merge branch 'es/worktree-add'
2015-10-26 Merge branch 'mr/worktree-list'
2015-10-20 Merge branch 'tb/t0027-crlf'
2015-10-20 Merge branch 'jk/war-on-sprintf'
2015-10-20 Merge branch 'js/gc-with-stale-symref' into maint
2015-10-20 Merge branch 'jc/doc-gc-prune-now' into maint
2015-10-20 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-19 Merge branch 'maint' of git://github.com/git-l10n/git...
2015-10-16 Merge branch 'jc/doc-gc-prune-now'
2015-10-16 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16 Merge branch 'es/worktree-add-cleanup' into maint
2015-10-16 Merge branch 'tk/doc-interpret-trailers-grammo' into...
2015-10-16 Merge branch 'tk/typofix-connect-unknown-proto-error...
2015-10-16 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16 Merge branch 'nd/ls-remote-does-not-have-u-option'...
2015-10-16 Merge branch 'jc/fsck-dropped-errors' into maint
2015-10-16 Merge branch 'sb/http-flaky-test-fix' into maint
2015-10-16 Merge branch 'sb/perf-without-installed-git' into maint
2015-10-16 Merge branch 'js/icase-wt-detection' into maint
2015-10-16 Merge branch 'pt/am-builtin' into maint
2015-10-16 Merge branch 'mm/detach-at-HEAD-reflog' into maint
2015-10-16 Merge branch 'gr/rebase-i-drop-warn' into maint
2015-10-16 Merge branch 'dt/log-follow-config' into maint
2015-10-16 Merge branch 'ti/glibc-stdio-mutex-from-signal-handler...
2015-10-16 Merge branch 'jk/notes-dwim-doc' into maint
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16 Merge branch 'jw/make-arflags-customizable' into maint
2015-10-16 Merge branch 'jk/connect-clear-env' into maint
2015-10-16 Merge branch 'jk/blame-first-parent' into maint
2015-10-16 Merge branch 'mm/keyid-docs' into maint
2015-10-16 Merge branch 'pt/pull-builtin' into maint
2015-10-15 Merge branch 'ls/p4-lfs'
2015-10-15 Merge branch 'js/gc-with-stale-symref'
2015-10-15 Merge branch 'js/clone-dissociate'
2015-10-15 Merge branch 'tk/doc-interpret-trailers-grammo'
2015-10-15 Merge branch 'es/worktree-add-cleanup'
2015-10-15 Merge branch 'dt/log-follow-config'
2015-10-15 Merge branch 'gr/rebase-i-drop-warn'
2015-10-15 Merge branch 'mm/detach-at-HEAD-reflog'
2015-10-15 Merge branch 'sa/send-email-smtp-batch-data-limit'
2015-10-15 Merge branch 'pt/am-builtin'
2015-10-15 Merge branch 'nd/clone-linked-checkout'
2015-10-15 Merge branch 'js/icase-wt-detection'
2015-10-15 Merge branch 'kn/for-each-branch'
2015-10-15 Merge branch 'sb/perf-without-installed-git'
2015-10-15 Merge branch 'sb/http-flaky-test-fix'
2015-10-15 Merge branch 'jc/fsck-dropped-errors'
2015-10-15 Merge branch 'ls/p4-translation-failure'
2015-10-15 Merge branch 'nd/gc-auto-background-fix'
2015-10-15 Merge branch 'mk/submodule-gitdir-path'
2015-10-14 Merge branch 'pt/pull-builtin'
2015-10-14 Merge branch 'nd/ls-remote-does-not-have-u-option'
2015-10-14 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-14 Merge branch 'tk/typofix-connect-unknown-proto-error'
2015-10-14 Merge branch 'jk/notes-dwim-doc'
2015-10-07 Merge branch 'ls/p4-path-encoding'
2015-10-07 Merge branch 'gb/filter-branch-progress'
2015-10-07 Merge branch 'nd/ignore-then-not-ignore'
2015-10-07 Merge branch 'ti/glibc-stdio-mutex-from-signal-handler'
2015-10-05 Sync with 2.6.1
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-29 Sync with v2.5.4
2015-09-28 Sync with 2.4.10
2015-09-28 Sync with 2.3.10
2015-09-28 Merge branch 'jk/xdiff-memory-limits' into maint-2.3
2015-09-28 xdiff: reject files larger than ~1GB
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long'
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report'
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
next