Merge branch 'jk/maint-pass-c-config-in-env'
[git] / ll-merge.c
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 '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 'sg/rerere-gc-old-still-used' into maint
2010-09-01  Junio C HamanoMerge branch 'en/rebase-against-rebase-fix' into maint
2010-08-31  Junio C HamanoMerge branch 'en/d-f-conflict-fix'
2010-08-31  Junio C HamanoMerge branch 'en/fast-export-fix'
2010-08-31  Junio C HamanoMerge branch 'sg/rerere-gc-old-still-used'
2010-08-30  Junio C HamanoMerge branch 'maint-1.7.1' 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 'cc/find-commit-subject'
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-03  Junio C HamanoMerge branch 'sv/maint-diff-q-clear-fix' into maint
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.1.2
2010-07-27  Junio C HamanoSync with 1.7.0 series
2010-07-26  Junio C HamanoMerge branch 'maint-1.7.1' into maint
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-26  Junio C HamanoMerge branch 'maint-1.6.4' into maint-1.6.5
2010-07-20  Junio C HamanoMerge branch 'maint'
2010-07-19  Junio C HamanoMerge branch 'maint'
2010-07-16  Junio C HamanoMerge branch 'jc/diff-merge-base-multi'
2010-07-15  Junio C HamanoMerge branch 'wp/merge-tree-fix'
2010-07-15  Junio C HamanoMerge branch 'js/merge-rr-fix'
2010-07-15  Junio C HamanoMerge branch 'jc/diff-merge-base-multi'
2010-07-15  Junio C HamanoMerge branch 'jn/grep-open'
2010-07-15  Junio C HamanoMerge branch 'jk/maint-status-keep-index-timestamp'
2010-07-15  Junio C HamanoMerge branch 'bc/maint-makefile-fixes'
2010-07-15  Junio C HamanoMerge branch 'maint'
2010-07-13  Junio C HamanoMerge branch 'maint'
2010-07-12  Junio C HamanoMerge branch 'maint'
2010-07-09  Junio C HamanoMerge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07  Junio C HamanoMerge branch 'maint'
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-07-07  Junio C HamanoMerge branch 'maint'
2010-07-06  Junio C HamanoMerge branch 'maint'
2010-07-05  Junio C HamanoMerge branch 'maint'
2010-07-02  Eyvind BernhardsenAvoid conflicts when merging branches with mixed normal...
2010-06-30  Junio C HamanoMerge branch 'ar/decorate-color'
2010-06-30  Junio C HamanoMerge branch 'mg/doc-rev-parse-treepath-syntax'
2010-06-30  Junio C HamanoMerge branch 'cc/cherry-pick-stdin'
2010-06-30  Junio C HamanoMerge branch 'jl/status-ignore-submodules'
2010-06-30  Junio C HamanoMerge branch 'jk/url-decode'
2010-06-30  Junio C HamanoMerge branch 'jn/grep-open'
2010-06-30  Junio C HamanoMerge branch 'jp/string-list-api-cleanup'
2010-06-30  Junio C HamanoMerge branch 'tr/rev-list-count'
2010-06-30  Junio C HamanoMerge branch 'as/maint-completion-set-u-fix'
2010-06-30  Junio C HamanoMerge branch 'jl/maint-diff-ignore-submodules'
2010-06-29  Junio C HamanoSync with 1.7.1.1
2010-06-29  Junio C HamanoMerge branch 'maint'
2010-06-27  Junio C HamanoMerge branch 'cp/textconv-cat-file'
2010-06-27  Junio C HamanoMerge branch 'pb/maint-perl-errmsg-no-dir'
2010-06-27  Junio C HamanoMerge branch 'tr/send-email-8bit'
2010-06-27  Junio C HamanoMerge branch 'js/maint-am-rebase-invalid-author'
2010-06-27  Junio C HamanoMerge branch 'ab/blame-textconv'
2010-06-27  Junio C HamanoMerge branch 'jn/show-num-walks'
2010-06-25  Junio C HamanoMerge branch 'maint'
2010-06-23  Junio C HamanoMerge branch 'jk/url-decode'
2010-06-22  Junio C HamanoMerge branch 'jc/maint-simpler-common-prefix'
2010-06-22  Junio C HamanoMerge branch 'sb/format-patch-signature'
2010-06-22  Junio C HamanoMerge branch 'mg/pretty-magic-space'
2010-06-22  Junio C HamanoMerge branch 'jn/gitweb-return-or-exit-cleanup'
2010-06-22  Junio C HamanoMerge branch 'bd/maint-unpack-trees-parawalk-fix'
2010-06-22  Junio C HamanoMerge branch 'cc/cherry-pick-series'
2010-06-22  Junio C HamanoMerge branch 'jc/rev-list-ancestry-path'
2010-06-22  Junio C HamanoMerge branch 'lt/extended-sha1-match-commit-with-regexp'
2010-06-22  Junio C HamanoMerge branch 'maint'
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
next