Merge branch 'rs/maint-diff-fd-leak' into maint
[git] / ll-merge.h
2010-12-26  Junio C HamanoMerge branch 'rs/maint-diff-fd-leak' into maint
2010-12-15  Junio C HamanoGit 1.7.3.4 v1.7.3.4
2010-12-15  Junio C HamanoGit 1.7.1.4 v1.7.1.4
2010-12-15  Junio C HamanoGit 1.7.0.9 v1.7.0.9
2010-12-14  Junio C HamanoMerge branch 'jk/maint-reflog-bottom' into maint
2010-12-14  Junio C HamanoMerge branch 'mz/maint-rebase-stat-config' into maint
2010-12-09  Junio C HamanoMerge branch 'np/diff-in-corrupt-repository' into maint
2010-12-09  Junio C HamanoMerge branch 'cm/diff-check-at-eol' into maint
2010-12-02  Junio C HamanoPrepare for 1.7.3.3
2010-12-02  Junio C HamanoGit 1.7.1.3 v1.7.1.3
2010-12-02  Junio C HamanoMerge branch 'cb/maint-orphan-merge-noclobber' into...
2010-12-02  Junio C HamanoMerge branch 'ks/no-textconv-symlink' into maint
2010-12-02  Junio C HamanoMerge branch 'maint-1.7.2' into maint
2010-12-02  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1
2010-11-24  Junio C HamanoMerge branch 'cb/diff-fname-optim' into maint
2010-11-24  Junio C HamanoMerge branch 'jk/no-textconv-symlink' into maint
2010-11-24  Junio C HamanoMerge branch 'aw/git-p4-deletion' into maint
2010-11-24  Junio C HamanoMerge branch 'kf/post-receive-sample-hook' into maint
2010-11-24  Junio C HamanoMerge branch 'mg/reset-doc' into maint
2010-11-24  Junio C HamanoMerge branch 'tr/send-email-refuse-sending-unedited...
2010-09-18  Junio C HamanoMerge branch 'js/ls-files-x-doc'
2010-09-15  Junio C HamanoMerge branch 'dr/maint-ls-tree-prefix-recursion-fix'
2010-09-15  Junio C HamanoMerge branch 'os/fix-rebase-diff-no-prefix'
2010-09-15  Junio C HamanoMerge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
2010-09-15  Junio C HamanoMerge branch 'ch/maint-cannot-create-bundle-error'
2010-09-15  Junio C HamanoMerge branch 'ks/recursive-rename-add-identical'
2010-09-15  Junio C HamanoMerge git://repo.or.cz/git-gui
2010-09-12  Junio C HamanoMerge branch 'maint'
2010-09-10  Junio C HamanoMerge branch 'maint'
2010-09-10  Junio C HamanoMerge branch 'maint'
2010-09-08  Junio C HamanoMerge branch 'tf/cleanup-builtin-help-headers'
2010-09-08  Junio C HamanoMerge branch 'jk/test-must-fail-missing'
2010-09-08  Junio C HamanoMerge branch 'jh/error-removing-missing-note'
2010-09-08  Junio C HamanoMerge branch 'kf/askpass-config'
2010-09-08  Junio C HamanoMerge branch 'bc/maint-fetch-url-only'
2010-09-08  Junio C HamanoMerge branch 'jk/maint-pass-c-config-in-env'
2010-09-08  Junio C HamanoMerge branch 'en/d-f-conflict-fix'
2010-09-07  Junio C HamanoMerge branch 'maint'
2010-09-06  Junio C HamanoMerge branch 'jh/clean-exclude'
2010-09-06  Junio C HamanoMerge branch 'jl/maint-fix-test'
2010-09-06  Junio C HamanoMerge branch 'maint' v1.7.3-rc0
2010-09-06  Junio C HamanoMerge branch 'xx/trivial' into maint
2010-09-04  Junio C HamanoMerge branch 'jl/submodule-ignore-diff'
2010-09-04  Junio C HamanoMerge branch 'ab/test-2'
2010-09-04  Junio C HamanoMerge branch 'js/detached-stash'
2010-09-04  Junio C HamanoMerge branch 'js/maint-reflog-beyond-horizon'
2010-09-04  Junio C HamanoMerge branch 'dg/local-mod-error-messages'
2010-09-04  Junio C HamanoMerge branch 'nd/maint-fix-replace'
2010-09-03  Junio C HamanoMerge branch 'ab/compat-regex'
2010-09-03  Junio C HamanoMerge branch 'nd/clone-depth-zero'
2010-09-03  Junio C HamanoMerge branch 'jn/maint-doc-user-manual-html-doctype'
2010-09-03  Junio C HamanoMerge branch 'cb/maint-mergetool-no-tty'
2010-09-03  Junio C HamanoMerge branch 'jn/apply-filename-with-sp'
2010-09-03  Junio C HamanoMerge branch 'jn/merge-custom-no-trivial'
2010-09-03  Junio C HamanoMerge branch 'jc/maint-doc-em-dash'
2010-09-03  Junio C HamanoMerge branch 'mg/doc-bundle'
2010-09-03  Junio C HamanoMerge branch 'jn/doc-backslash'
2010-09-03  Junio C HamanoMerge branch 'jn/update-contrib-example-merge'
2010-09-03  Junio C HamanoMerge branch 'jn/merge-renormalize'
2010-09-01  Junio C HamanoMerge branch 'en/rebase-against-rebase-fix' into maint
2010-08-22  Junio C HamanoMerge branch 'nd/fix-sparse-checkout'
2010-08-22  Junio C HamanoMerge branch 'en/rebase-against-rebase-fix'
2010-08-19  Junio C HamanoMerge branch 'tr/xsize-bits' into maint
2010-08-19  Junio C HamanoMerge branch 'jc/sha1-name-find-fix' into maint
2010-08-18  Junio C HamanoMerge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18  Junio C HamanoMerge branch 'tr/xsize-bits'
2010-08-13  Junio C HamanoMerge branch 'jc/sha1-name-find-fix'
2010-08-13  Junio C HamanoMerge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-06  Jonathan Niederll-merge: let caller decide whether to renormalize
2010-08-06  Jonathan Niederll-merge: make flag easier to populate
2010-08-02  Junio C HamanoMerge git://repo.or.cz/git-gui into pt/git-gui
2010-07-27  Junio C HamanoSync with 1.7.0 series
2010-07-26  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1
2010-07-26  Junio C HamanoMerge branch 'maint-1.6.6' into maint-1.7.0
2010-07-16  Junio C HamanoMerge branch 'jc/diff-merge-base-multi'
2010-07-15  Junio C HamanoMerge branch 'jc/diff-merge-base-multi'
2010-07-09  Junio C HamanoMerge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07  Junio C HamanoMerge branch 'maint-1.6.4' into maint
2010-07-07  Junio C HamanoMerge branch 'tr/receive-pack-aliased-update-fix' into...
2010-06-22  Junio C HamanoMerge branch 'tc/commit-abbrev-fix' into maint
2010-06-22  Junio C HamanoMerge branch 'cc/maint-diff-CC-binary' into maint
2010-06-22  Junio C HamanoMerge branch 'pc/remove-warn' into maint
2010-06-21  Junio C HamanoMerge branch 'js/maint-receive-pack-symref-alias'
2010-06-21  Junio C HamanoMerge branch 'eb/core-eol'
2010-06-21  Junio C HamanoMerge branch 'fg/autocrlf'
2010-06-21  Junio C HamanoMerge branch 'tc/commit-abbrev-fix'
2010-06-21  Junio C HamanoMerge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21  Junio C HamanoMerge branch 'js/async-thread'
2010-06-21  Junio C HamanoMerge branch 'cb/assume-unchanged-fix' into maint
2010-06-21  Junio C HamanoMerge branch 'rs/diff-no-minimal' into maint
2010-06-21  Junio C HamanoMerge branch 'bg/apply-blank-trailing-context' into...
2010-06-18  Junio C HamanoMerge branch 'cc/maint-diff-CC-binary'
2010-06-16  Junio C HamanoMerge branch 'cw/maint-exec-defpath' into maint
2010-06-16  Junio C HamanoMerge branch 'sc/http-late-auth' into maint
2010-06-16  Junio C HamanoMerge branch 'cb/maint-stash-orphaned-file' into maint
2010-06-16  Junio C HamanoMerge branch 'jn/maint-bundle' into maint
2010-06-16  Junio C HamanoMerge branch 'rr/doc-submitting' into maint
2010-06-16  Junio C HamanoMerge branch 'jn/t7006-fixup' into maint
2010-06-16  Junio C HamanoMerge branch 'jn/shortlog' into maint
2010-06-16  Junio C HamanoMerge branch 'np/index-pack-memsave' into maint
next