msvc: git-daemon.exe: Fix linker "unresolved externals" error
[git] / merge-recursive.c
2010-09-01  Junio C HamanoMerge branch 'gp/pack-refs-remove-empty-dirs' into...
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 'np/maint-huge-delta-generation'
2010-08-31  Junio C HamanoMerge branch 'da/fix-submodule-sync-superproject-config'
2010-08-31  Junio C HamanoMerge branch 'jn/cherry-revert-message-clean-up'
2010-08-31  Junio C HamanoMerge branch 'cb/binary-patch-id'
2010-08-31  Junio C HamanoMerge branch 'ab/maint-reset-mixed-w-pathspec-advice'
2010-08-31  Junio C HamanoMerge branch 'dj/fetch-tagopt'
2010-08-31  Junio C HamanoMerge branch 'en/d-f-conflict-fix'
2010-08-31  Junio C HamanoMerge branch 'jn/svn-fe'
2010-08-31  Junio C HamanoMerge branch 'tr/maint-no-unquote-plus'
2010-08-31  Junio C HamanoMerge branch 'jn/paginate-fix'
2010-08-31  Junio C HamanoMerge branch 'jn/maint-setup-fix'
2010-08-31  Junio C HamanoMerge branch 'en/fast-export-fix'
2010-08-31  Junio C HamanoMerge branch 'hv/autosquash-config'
2010-08-31  Junio C HamanoMerge branch 'sg/rerere-gc-old-still-used'
2010-08-30  Junio C HamanoMerge branch 'maint'
2010-08-30  Junio C HamanoMerge branch 'maint-1.7.1' into maint
2010-08-27  Justin Frankelmerge-recursive: options to ignore whitespace changes
2010-08-26  Junio C HamanoMerge branch 'maint'
2010-08-26  Justin Frankelmerge-recursive --patience
2010-08-26  Jonathan Niederll-merge: replace flag argument with options struct
2010-08-26  Jonathan Niedermerge-recursive: expose merge options for builtin merge
2010-08-24  Junio C HamanoMerge branch 'maint'
2010-08-23  Junio C HamanoMerge branch 'maint'
2010-08-22  Junio C HamanoMerge branch 'mm/rebase-i-exec'
2010-08-22  Junio C HamanoMerge branch 'gb/split-cmdline-errmsg'
2010-08-22  Junio C HamanoMerge branch 'so/http-user-agent'
2010-08-22  Junio C HamanoMerge branch 'mm/shortopt-detached'
2010-08-22  Junio C HamanoMerge branch 'sr/local-config'
2010-08-22  Junio C HamanoMerge branch 'nd/fix-sparse-checkout'
2010-08-22  Junio C HamanoMerge branch 'hv/submodule-find-ff-merge'
2010-08-22  Junio C HamanoMerge branch 'en/rebase-against-rebase-fix'
2010-08-22  Junio C HamanoMerge branch 'dg/local-mod-error-messages'
2010-08-22  Junio C HamanoMerge branch 'po/userdiff-csharp'
2010-08-22  Junio C HamanoMerge branch 'ab/perl-install'
2010-08-22  Junio C HamanoMerge branch 'maint'
2010-08-20  Junio C HamanoMerge branch 'maint'
2010-08-20  Elijah Newrenmerge-recursive: Avoid excessive output for and reproce...
2010-08-19  Junio C HamanoMerge branch 'maint' to sync with 1.7.2.2
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 'jc/maint-follow-rename-fix'
2010-08-18  Junio C HamanoMerge branch 'tf/string-list-init'
2010-08-18  Junio C HamanoMerge branch 'cc/find-commit-subject'
2010-08-18  Junio C HamanoMerge branch 'ab/report-corrupt-object-with-type'
2010-08-18  Junio C HamanoMerge branch 'jn/fast-import-subtree'
2010-08-18  Junio C HamanoMerge branch 'ar/string-list-foreach'
2010-08-18  Junio C HamanoMerge branch 'jh/graph-next-line'
2010-08-18  Junio C HamanoMerge branch 'tr/xsize-bits'
2010-08-18  Elijah Newrenmerge-recursive: Fix multiple file rename across D...
2010-08-18  Elijah Newrenmerge-recursive: Fix typo
2010-08-18  Junio C HamanoMerge branch 'tc/checkout-B'
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-11  Matthieu Moyunpack_trees: group error messages by type
2010-08-11  Matthieu Moymerge-recursive: distinguish "removed" and "overwritten...
2010-08-11  Diane Gasselinmerge-recursive: porcelain messages for checkout
2010-08-11  Matthieu MoyTurn unpack_trees_options.msgs into an array + enum
2010-08-06  Jonathan Niedermerge-recursive --renormalize
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-06  Jonathan Niedermerge-trees: let caller decide whether to renormalize
2010-08-06  Jonathan Niedermerge-trees: push choice to renormalize away from low...
2010-08-03  Junio C HamanoMerge branch 'gp/pack-refs-remove-empty-dirs'
2010-08-03  Junio C HamanoMerge branch 'sv/maint-diff-q-clear-fix' into maint
2010-08-02  Junio C HamanoMerge branch 'ab/tap' 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.5' into maint-1.6.6
2010-07-26  Junio C HamanoMerge branch 'maint-1.6.4' into maint-1.6.5
2010-07-23  Christian Coudermerge-recursive: use find_commit_subject() instead...
2010-07-20  Junio C HamanoMerge branch 'maint'
2010-07-19  Junio C HamanoMerge branch 'maint'
2010-07-19  Junio C HamanoMerge branch 'jl/add-n-ignore-missing'
2010-07-16  Junio C HamanoMerge branch 'jc/diff-merge-base-multi'
2010-07-15  Junio C HamanoMerge branch 'jn/paginate-fix'
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 'ns/merge-recursive-uptodate'
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  Nicolas Sebrechtmerge-recursive: use "up-to-date" instead of "uptodate...
2010-07-09  Elijah Newrenmerge_recursive: Fix renames across paths below D/F...
2010-07-09  Elijah Newrenmerge-recursive: Fix D/F conflicts
2010-07-09  Junio C HamanoMerge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07  Junio C HamanoMerge branch 'ab/tap'
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...
next