Merge branch 'jn/fortify-source-workaround'
[git] / merge-recursive.c
2011-03-23  Junio C HamanoMerge branch 'jn/fortify-source-workaround'
2011-03-23  Junio C HamanoMerge branch 'jn/maint-c99-format'
2011-03-23  Junio C HamanoMerge branch 'lt/default-abbrev'
2011-03-23  Junio C HamanoMerge branch 'pk/stash-apply-status-relative'
2011-03-23  Junio C HamanoMerge branch 'jc/maint-diff-q-filter'
2011-03-23  Junio C HamanoMerge branch 'pw/p4'
2011-03-23  Junio C HamanoMerge branch 'mg/rev-list-one-side-only'
2011-03-23  Junio C HamanoMerge branch 'js/maint-stash-index-copy'
2011-03-23  Junio C HamanoMerge branch 'tl/p4'
2011-03-23  Junio C HamanoMerge branch 'mg/doc-bisect-tweak-worktree'
2011-03-23  Junio C HamanoMerge branch 'jn/test-sanitize-git-env'
2011-03-23  Junio C HamanoMerge branch 'sp/maint-upload-pack-stop-early'
2011-03-23  Junio C HamanoMerge branch 'sp/maint-fetch-pack-stop-early'
2011-03-23  Junio C HamanoMerge branch 'jc/maint-rev-list-culled-boundary'
2011-03-23  Junio C HamanoMerge branch 'jc/maint-fetch-alt'
2011-03-23  Junio C HamanoMerge branch 'sg/complete-symmetric-diff'
2011-03-23  Junio C HamanoMerge branch 'svn-fe' of git://repo.or.cz/git/jrn
2011-03-22  Junio C HamanoMerge branch 'maint'
2011-03-21  Junio C HamanoMerge branch 'maint'
2011-03-21  Junio C HamanoMerge branch 'sp/maint-fd-limit' into maint
2011-03-21  Junio C HamanoMerge branch 'mr/hpux' into maint
2011-03-21  Junio C HamanoMerge branch 'so/submodule-no-update-first-time' into...
2011-03-21  Junio C HamanoMerge branch 'mo/perl-bidi-pipe-envfix' into maint
2011-03-21  Junio C HamanoMerge branch 'ae/better-template-failure-report' into...
2011-03-20  Junio C HamanoMerge branch 'mm/maint-log-n-with-diff-filtering'
2011-03-20  Junio C HamanoMerge branch 'mg/rev-list-n-reverse-doc'
2011-03-20  Junio C HamanoMerge branch 'js/rerere-forget-always-take-pathspec'
2011-03-20  Junio C HamanoMerge branch 'ab/i18n-basic'
2011-03-20  Junio C HamanoMerge branch 'uk/ls-remote-in-get-remote-url'
2011-03-20  Junio C HamanoMerge branch 'ss/mergetool--lib'
2011-03-20  Junio C HamanoMerge branch 'jn/status-translatable'
2011-03-20  Junio C HamanoMerge branch 'jk/trace-sifter'
2011-03-20  Junio C HamanoMerge branch 'jk/format-patch-multiline-header'
2011-03-20  Junio C HamanoMerge branch 'jk/merge-rename-ux'
2011-03-20  Junio C HamanoMerge branch 'maint'
2011-03-18  Junio C HamanoMerge branch 'maint'
2011-03-16  Junio C HamanoMerge branch 'maint'
2011-03-16  Junio C HamanoMerge branch 'jn/maint-commit-missing-template' into...
2011-03-16  Junio C HamanoMerge branch 'lt/rename-no-extra-copy-detection' into...
2011-03-16  Junio C HamanoMerge branch 'jk/diffstat-binary' into maint
2011-03-16  Junio C HamanoMerge branch 'mg/maint-difftool-vim-readonly' into...
2011-03-16  Junio C HamanoMerge branch 'jn/test-terminal-punt-on-osx-breakage...
2011-03-16  Junio C HamanoMerge branch 'jk/fail-null-clone' into maint
2011-03-16  Junio C HamanoMerge branch 'jh/push-default-upstream-configname'...
2011-03-16  Junio C HamanoMerge branch 'mg/placeholders-are-lowercase' into maint
2011-03-16  Junio C HamanoMerge branch 'mg/patch-id' into maint
2011-03-16  Junio C HamanoMerge branch 'js/maint-merge-use-prepare-commit-msg...
2011-03-16  Jonathan Niederstandardize brace placement in struct definitions
2011-03-16  Junio C HamanoMerge branch 'nd/struct-pathspec'
2011-03-15  Junio C HamanoMerge branch 'jk/strbuf-vaddf'
2011-03-15  Junio C HamanoMerge branch 'jh/maint-do-not-track-non-branches'
2011-03-14  Junio C HamanoMerge branch 'sp/maint-smart-http-sans-100-continue'
2011-03-04  Junio C HamanoMerge branch 'jn/maint-commit-missing-template'
2011-03-04  Junio C HamanoMerge branch 'jk/diffstat-binary'
2011-03-04  Junio C HamanoMerge branch 'jn/test-terminal-punt-on-osx-breakage'
2011-02-28  Junio C HamanoMerge branch 'uk/checkout-ambiguous-ref'
2011-02-28  Junio C HamanoMerge branch 'sp/maint-smart-http-sans-100-continue'
2011-02-26  Jonathan NiederMerge commit 'jn/svn-fe' of git://github.com/gitster...
2011-02-26  Jeff Kingstrbuf: add strbuf_vaddf
2011-02-21  Jeff Kingmerge: enable progress reporting for rename detection
2011-02-21  Jeff Kingbump rename limit defaults (again)
2011-02-21  Jeff Kingmerge: improve inexact rename limit warning
2011-02-16  Junio C HamanoMerge branch 'maint-1.7.3' into maint
2011-02-16  Junio C HamanoMerge branch 'maint-1.7.2' into maint-1.7.3
2011-02-16  Junio C HamanoMerge branch 'maint-1.7.1' into maint-1.7.2
2011-02-16  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1
2011-02-10  Junio C HamanoMerge branch 'tr/merge-unborn-clobber'
2011-02-10  Junio C HamanoMerge branch 'jn/unpack-lstat-failure-report'
2011-02-10  Junio C HamanoMerge branch 'cb/setup'
2011-02-10  Junio C HamanoMerge branch 'maint-1.7.0' into maint
2011-01-31  Junio C HamanoMerge branch 'jl/fetch-submodule-recursive' into maint
2011-01-27  Junio C HamanoMerge branch 'maint'
2011-01-27  Junio C HamanoMerge branch 'jn/fast-import-empty-tree-removal' into...
2011-01-19  Junio C HamanoMerge branch 'maint'
2011-01-19  Junio C HamanoMerge branch 'jk/diff-driver-binary-doc' into maint
2011-01-19  Junio C HamanoMerge branch 'tr/submodule-relative-scp-url' into maint
2011-01-19  Junio C HamanoMerge branch 'jn/maint-fast-import-object-reuse' into...
2011-01-19  Junio C HamanoMerge branch 'nd/maint-relative' into maint
2011-01-13  Junio C HamanoMerge branch 'jn/gitweb-no-logo'
2011-01-13  Junio C HamanoMerge branch 'jk/diff-driver-binary-doc'
2011-01-13  Junio C HamanoMerge branch 'tr/submodule-relative-scp-url'
2011-01-13  Junio C HamanoMerge branch 'maint'
2011-01-10  Junio C HamanoMerge branch 'maint'
2011-01-10  Junio C HamanoMerge branch 'maint-1.7.2' into maint
2011-01-10  Junio C HamanoMerge branch 'maint-1.7.1' into maint-1.7.2
2011-01-10  Junio C HamanoMerge branch 'maint-1.7.0' into maint-1.7.1
2011-01-09  Junio C HamanoMerge branch 'maint'
2011-01-05  Junio C HamanoMerge branch 'maint' to sync with 1.7.3.5
2011-01-05  Junio C HamanoMerge branch 'jn/svn-fe' (early part)
2011-01-05  Junio C HamanoMerge branch 'ao/t9001-fix'
2011-01-05  Junio C HamanoMerge branch 'mg/cvsimport'
2011-01-04  Junio C HamanoMerge branch 'maint'
2010-12-28  Junio C HamanoMerge branch 'maint'
2010-12-28  Junio C HamanoMerge branch 'jc/maint-rebase-rewrite-last-skip'
2010-12-28  Junio C HamanoMerge branch 'nd/setup'
2010-12-26  Junio C HamanoMerge branch 'rs/maint-diff-fd-leak' into maint
2010-12-23  Junio C HamanoMerge branch 'rj/maint-difftool-cygwin-workaround'
2010-12-23  Junio C HamanoMerge branch 'maint'
2010-12-22  Junio C HamanoMerge branch 'rj/maint-test-fixes'
2010-12-22  Junio C HamanoMerge branch 'jc/maint-am-abort-safely'
next