Merge branch 'jk/maint-upload-pack-shallow'
[gitweb.git] / builtin / merge-index.c
2011-04-27 Merge branch 'jk/maint-upload-pack-shallow'
2011-04-27 Merge branch 'jk/maint-stash-oob'
2011-04-27 Merge branch 'jc/pack-objects-bigfile'
2011-04-27 Merge branch 'mg/reflog-with-options'
2011-04-27 Merge branch 'ar/clean-rmdir-empty'
2011-04-27 Merge branch 'mg/sha1-path-advise'
2011-04-19 Sync with 1.7.4.5
2011-04-14 Merge branch 'maint'
2011-04-13 Merge branch 'maint'
2011-04-12 Merge branch 'js/checkout-untracked-symlink'
2011-04-12 Merge branch 'nd/init-gitdir'
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2011-04-06 Sync with 1.7.4.4
2011-04-06 Merge branch 'jk/maint-remote-mirror-safer'
2011-04-04 Merge branch 'maint'
2011-04-04 Merge branch 'jl/submodule-fetch-on-demand'
2011-04-04 Merge branch 'jc/rev-list-options-fix'
2011-04-04 Merge branch 'nm/maint-conflicted-submodule-entries'
2011-04-03 Merge branch 'maint'
2011-04-03 Merge branch 'jc/maint-rev-list-culled-boundary' into...
2011-04-03 Sync with 1.7.4.3
2011-04-02 Merge branch 'nd/init-gitdir'
2011-04-02 Merge branch 'jc/merge-sans-branch'
2011-04-02 Merge branch 'ab/i18n-st'
2011-04-02 Merge branch 'sb/sparse-more'
2011-04-02 Merge branch 'maint'
2011-04-01 Merge branch 'jc/maint-diff-q-filter' into maint
2011-03-31 Merge branch 'maint'
2011-03-30 Merge branch 'maint'
2011-03-30 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-29 Merge branch 'maint'
2011-03-29 Merge branch 'jc/fetch-progressive-stride'
2011-03-29 Merge branches 'sp/maint-fetch-pack-stop-early' and...
2011-03-28 Merge branch 'maint'
2011-03-27 Merge branch 'mg/rev-list-n-parents'
2011-03-27 Merge branch 'jp/completion-help-alias'
2011-03-27 Merge branch 'jc/index-update-if-able'
2011-03-27 Merge branch 'jk/checkout-orphan-warning'
2011-03-27 Merge branch 'jc/maint-rerere-in-workdir'
2011-03-27 Merge branch 'nd/index-doc'
2011-03-27 Merge branch 'jc/fetch-progressive-stride'
2011-03-26 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-26 Merge git-gui 0.14.0
2011-03-26 Sync with 1.7.4.2
2011-03-23 Merge branch 'kc/gitweb-pathinfo-w-anchor'
2011-03-23 Merge branch 'jn/fortify-source-workaround'
2011-03-23 Merge branch 'jn/maint-c99-format'
2011-03-23 Merge branch 'lt/default-abbrev'
2011-03-23 Merge branch 'pk/stash-apply-status-relative'
2011-03-23 Merge branch 'jc/maint-diff-q-filter'
2011-03-23 Merge branch 'pw/p4'
2011-03-23 Merge branch 'mg/rev-list-one-side-only'
2011-03-23 Merge branch 'js/maint-stash-index-copy'
2011-03-23 Merge branch 'tl/p4'
2011-03-23 Merge branch 'mg/doc-bisect-tweak-worktree'
2011-03-23 Merge branch 'jn/test-sanitize-git-env'
2011-03-23 Merge branch 'sp/maint-upload-pack-stop-early'
2011-03-23 Merge branch 'sp/maint-fetch-pack-stop-early'
2011-03-23 Merge branch 'jc/maint-rev-list-culled-boundary'
2011-03-23 Merge branch 'jc/maint-fetch-alt'
2011-03-23 Merge branch 'sg/complete-symmetric-diff'
2011-03-23 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-22 Merge branch 'maint'
2011-03-22 Fix sparse warnings
2011-03-16 Merge branch 'jk/diffstat-binary' into maint
2011-03-14 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-03-04 Merge branch 'jk/diffstat-binary'
2011-02-28 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-02-16 Merge branch 'maint-1.7.0' into maint-1.7.1
2011-02-10 Merge branch 'maint-1.7.0' into maint
2011-01-19 Merge branch 'jk/diff-driver-binary-doc' into maint
2011-01-19 Merge branch 'tr/submodule-relative-scp-url' into maint
2011-01-19 Merge branch 'jn/maint-fast-import-object-reuse' into...
2011-01-13 Merge branch 'jk/diff-driver-binary-doc'
2011-01-13 Merge branch 'tr/submodule-relative-scp-url'
2011-01-10 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-12-26 Merge branch 'rs/maint-diff-fd-leak' into maint
2010-12-16 Merge branch 'jn/maint-fast-import-object-reuse'
2010-12-15 Git 1.7.1.4 v1.7.1.4
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-12-14 Merge branch 'mz/maint-rebase-stat-config' into maint
2010-12-13 Merge branch 'mz/maint-rebase-stat-config'
2010-12-09 Merge branch 'np/diff-in-corrupt-repository' into maint
2010-12-09 Merge branch 'cm/diff-check-at-eol' into maint
2010-12-02 Git 1.7.1.3 v1.7.1.3
2010-12-02 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-11-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into maint
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-19 Merge branch 'jc/sha1-name-find-fix' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'tr/xsize-bits'
next