Merge branch 'js/mingw-tests-2.8' into maint
[gitweb.git] / builtin / merge-index.c
2016-04-29 Merge branch 'ep/trace-doc-sample-fix' into maint
2016-04-29 Merge branch 'jc/makefile-redirection-stderr' into...
2016-04-29 Merge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-29 Merge branch 'sk/send-pack-all-fix' into maint
2016-04-29 Merge branch 'sg/diff-multiple-identical-renames' into...
2016-04-15 Merge branch 'ss/commit-squash-msg' into maint
2016-04-15 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
2016-04-15 Merge branch 'pb/t7502-drop-dup' into maint
2016-04-15 Merge branch 'ss/exc-flag-is-a-collection-of-bits'...
2016-04-15 Merge branch 'oa/doc-diff-check' into maint
2016-04-15 Merge branch 'pb/opt-cmdmode-doc' into maint
2016-04-15 Merge branch 'nd/apply-doc' into maint
2016-03-21 Merge branch 'mm/doc-hooks-linkgit-fix' into maint
2016-03-21 Merge branch 'es/st-add4-gcc-4.2-workaround' into maint
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-17 Sync with Git 2.6.6
2016-03-16 Merge branch 'jc/sane-grep'
2016-03-16 Merge branch 'jk/path-name-safety-2.6' into jk/path...
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-10 Merge branch 'ma/update-hooks-sample-typofix' into...
2016-03-10 Merge branch 'ps/plug-xdl-merge-leak' into maint
2016-03-10 Merge branch 'ak/git-strip-extension-from-dashed-comman...
2016-03-10 Merge branch 'ak/extract-argv0-last-dir-sep' into maint
2016-03-10 Merge branch 'jk/pack-idx-corruption-safety' into maint
2016-03-10 Merge branch 'jk/grep-binary-workaround-in-test' into...
2016-03-10 Merge branch 'mm/push-simple-doc' into maint
2016-03-10 Merge branch 'jk/more-comments-on-textconv' into maint
2016-03-10 Merge branch 'jk/no-diff-emit-common' into maint
2016-03-10 Merge branch 'jc/am-i-v-fix' into maint
2016-03-10 Merge branch 'nd/dwim-wildcards-as-pathspecs' into...
2016-03-10 Merge branch 'mg/work-tree-tests' into maint
2016-03-04 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-03-04 Merge branch 'jk/pack-idx-corruption-safety'
2016-03-03 Merge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-26 Merge branch 'ma/update-hooks-sample-typofix'
2016-02-26 Merge branch 'jk/grep-binary-workaround-in-test'
2016-02-26 Merge branch 'ps/plug-xdl-merge-leak'
2016-02-26 Merge branch 'mm/push-simple-doc'
2016-02-26 Merge branch 'mg/work-tree-tests'
2016-02-26 Merge branch 'jk/more-comments-on-textconv'
2016-02-26 Merge branch 'jk/no-diff-emit-common'
2016-02-26 Merge branch 'ak/git-strip-extension-from-dashed-command'
2016-02-26 Merge branch 'ak/extract-argv0-last-dir-sep'
2016-02-24 Merge branch 'jc/am-i-v-fix'
2016-02-24 Merge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22 Merge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22 Merge branch 'jk/config-include'
2016-02-22 Merge branch 'nd/ita-cleanup' into maint
2016-02-17 Merge branch 'jk/rerere-xsnprintf'
2016-02-17 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-02-17 Merge branch 'js/xmerge-marker-eol' into maint
2016-02-10 Merge branch 'wp/sha1-name-negative-match'
2016-02-10 Merge branch 'js/xmerge-marker-eol'
2016-02-05 Merge branch 'lv/add-doc-working-tree' into maint
2016-02-05 Merge branch 'ss/clone-depth-single-doc' into maint
2016-02-05 Merge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05 Merge branch 'ew/for-each-ref-doc' into maint
2016-02-05 Merge branch 'ss/user-manual' into maint
2016-02-05 Merge branch 'js/dirname-basename' into maint
2016-02-05 Merge branch 'tb/complete-word-diff-regex' into maint
2016-02-05 Merge branch 'nd/diff-with-path-params' into maint
2016-02-05 Merge branch 'ew/svn-1.9.0-auth' into maint
2016-02-05 Merge branch 'jk/sanity' into maint
2016-02-05 Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...
2016-02-05 Merge branch 'ho/gitweb-squelch-undef-warning' into...
2016-02-05 Merge branch 'js/fopen-harder' into maint
2016-02-05 Merge branch 'nd/exclusion-regression-fix' into maint
2016-02-05 Merge branch 'dk/reflog-walk-with-non-commit' into...
2016-02-05 Merge branch 'dw/signoff-doc' into maint
2016-02-05 Merge branch 'jk/clang-pedantic' into maint
2016-02-05 Merge branch 'ew/send-email-mutt-alias-fix' into maint
2016-02-05 Merge branch 'nd/dir-exclude-cleanup' into maint
2016-02-05 Merge branch 'nd/stop-setenv-work-tree' into maint
2016-02-03 Merge branch 'js/dirname-basename'
2016-02-03 Merge branch 'nd/diff-with-path-params'
2016-02-03 Merge branch 'lv/add-doc-working-tree'
2016-02-03 Merge branch 'tb/complete-word-diff-regex'
2016-02-01 Merge branch 'ew/svn-1.9.0-auth'
2016-01-29 Merge branch 'jk/sanity'
2016-01-26 Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'
2016-01-22 Merge branch 'rm/subtree-unwrap-tags'
2016-01-20 Merge branch 'tg/grep-no-index-fallback'
2016-01-20 Merge branch 'ho/gitweb-squelch-undef-warning'
2016-01-20 Merge branch 'js/fopen-harder'
2016-01-20 Merge branch 'ss/clone-depth-single-doc'
2016-01-20 Merge branch 'nd/exclusion-regression-fix'
2016-01-20 Merge branch 'dk/reflog-walk-with-non-commit'
2016-01-20 Merge branch 'sg/t6050-failing-editor-test-fix'
2016-01-20 Merge branch 'ew/for-each-ref-doc'
2016-01-20 Merge branch 'dw/signoff-doc'
2016-01-20 Merge branch 'jk/clang-pedantic'
2016-01-20 Merge branch 'ew/send-email-mutt-alias-fix'
2016-01-20 Merge branch 'ss/user-manual'
2016-01-20 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-01-20 Merge branch 'nd/ita-cleanup'
2016-01-20 Merge branch 'nd/dir-exclude-cleanup'
2016-01-20 Merge branch 'jk/pack-revindex'
2016-01-12 Merge branch 'ea/blame-progress'
2016-01-12 Merge branch 'ep/make-phoney'
2016-01-12 Merge branch 'nd/stop-setenv-work-tree'
next