Sync with 1.7.4.2
[gitweb.git] / Documentation / git-merge-index.txt
2011-03-26 Sync with 1.7.4.2
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-21 Merge branch 'maint'
2011-03-20 Merge branch 'mm/maint-log-n-with-diff-filtering'
2011-03-20 Merge branch 'mg/rev-list-n-reverse-doc'
2011-03-20 Merge branch 'js/rerere-forget-always-take-pathspec'
2011-03-20 Merge branch 'ab/i18n-basic'
2011-03-20 Merge branch 'uk/ls-remote-in-get-remote-url'
2011-03-20 Merge branch 'ss/mergetool--lib'
2011-03-20 Merge branch 'jn/status-translatable'
2011-03-20 Merge branch 'jk/trace-sifter'
2011-03-20 Merge branch 'jk/format-patch-multiline-header'
2011-03-20 Merge branch 'jk/merge-rename-ux'
2011-03-20 Merge branch 'maint'
2011-03-18 Merge branch 'maint'
2011-03-16 Merge branch 'maint'
2011-03-16 Merge branch 'jk/diffstat-binary' into maint
2011-03-16 Merge branch 'nd/struct-pathspec'
2011-03-15 Merge branch 'jk/strbuf-vaddf'
2011-03-15 Merge branch 'mm/push-default-advice'
2011-03-15 Merge branch 'jn/maint-instaweb-plack-fix'
2011-03-15 Merge branch 'sp/maint-fd-limit'
2011-03-15 Merge branch 'jc/checkout-orphan-warning'
2011-03-15 Merge branch 'jh/maint-do-not-track-non-branches'
2011-03-15 Merge branch 'fk/maint-cvsimport-early-failure'
2011-03-15 Merge branch 'jc/maint-apply-report-offset'
2011-03-15 Merge branch 'jc/maint-apply-no-double-patch'
2011-03-15 Merge branch 'mr/hpux'
2011-03-15 Merge branch 'jk/doc-credits' of git://github.com/peff/git
2011-03-14 Merge branch 'sp/maint-smart-http-sans-100-continue'
2011-03-11 doc: drop author/documentation sections from most pages
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.2' into maint-1.7.3
2011-02-10 Merge branch 'tr/merge-unborn-clobber'
2011-02-10 Merge branch 'maint-1.7.0' into maint
2011-01-31 Merge branch 'jl/fetch-submodule-recursive' into maint
2011-01-27 Merge branch 'jn/fast-import-empty-tree-removal' into...
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-19 Merge branch 'nd/maint-relative' into maint
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.2' into maint
2010-12-26 Merge branch 'rs/maint-diff-fd-leak' into maint
2010-12-16 Merge branch 'jl/fetch-submodule-recursive'
2010-12-16 Merge branch 'nd/maint-relative'
2010-12-16 Merge branch 'jn/maint-svn-fe'
2010-12-16 Merge branch 'jn/maint-fast-import-object-reuse'
2010-12-15 Git 1.7.3.4 v1.7.3.4
2010-12-15 Git 1.7.0.9 v1.7.0.9
2010-12-15 Merge branch 'master' (early part) into pd/bash-4-compl...
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-12-14 Merge branch 'jk/maint-reflog-bottom' into maint
2010-12-14 Merge branch 'mz/maint-rebase-stat-config' into maint
2010-12-13 Merge branch 'jk/maint-reflog-bottom'
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-08 Merge branch 'jh/notes-merge'
2010-12-04 Merge branch 'jj/icase-directory'
2010-12-02 Prepare for 1.7.3.3
2010-12-02 Merge branch 'cb/maint-orphan-merge-noclobber' into...
2010-12-02 Merge branch 'ks/no-textconv-symlink' into maint
2010-12-02 Merge branch 'maint-1.7.2' into maint
2010-12-01 Merge branch 'js/maint-apply-tab-in-indent-fix' into...
2010-11-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-24 Merge branch 'cb/maint-orphan-merge-noclobber'
2010-11-24 Merge branch 'cb/diff-fname-optim' into maint
2010-11-24 Merge branch 'jk/no-textconv-symlink' into maint
2010-11-24 Merge branch 'aw/git-p4-deletion' into maint
2010-11-24 Merge branch 'kf/post-receive-sample-hook' into maint
2010-11-24 Merge branch 'mg/reset-doc' into maint
2010-11-24 Merge branch 'tr/send-email-refuse-sending-unedited...
2010-11-17 Merge branch 'ks/no-textconv-symlink'
2010-11-17 Merge branch 'cb/diff-fname-optim'
2010-11-17 Merge branch 'jk/no-textconv-symlink'
2010-11-05 Merge branch 'aw/git-p4-deletion'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-10-27 Merge branch 'kb/merge-recursive-rename-threshold'
2010-10-27 Merge branch 'as/daemon-multi-listen'
2010-10-27 Merge branch 'kf/post-receive-sample-hook'
next