setup_unpack_trees_porcelain: take the whole options struct as parameter
[git.git] / merge-recursive.c
2010-09-03 Matthieu Moysetup_unpack_trees_porcelain: take the whole options...
2010-09-03 Matthieu MoyMove set_porcelain_error_msgs to unpack-trees.c and...
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-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 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...
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-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 'jp/string-list-api-cleanup'
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-28 Junio C HamanoMerge branch 'tr/send-email-8bit' into maint
2010-06-28 Junio C HamanoMerge branch 'pb/maint-perl-errmsg-no-dir' into maint
2010-06-28 Junio C HamanoMerge branch 'js/maint-am-rebase-invalid-author' into...
2010-06-28 Junio C HamanoMerge branch 'jc/maint-simpler-common-prefix' into...
2010-06-28 Junio C HamanoMerge branch 'bd/maint-unpack-trees-parawalk-fix' into...
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 Julian PhillipsMerge branch 'jp/string-list-api-cleanup' into jn/grep...
2010-06-27 Julian Phillipsstring_list: Fix argument order for string_list_lookup
2010-06-27 Julian Phillipsstring_list: Fix argument order for string_list_insert
2010-06-22 Junio C HamanoMerge branch 'jc/maint-simpler-common-prefix'
2010-06-22 Junio C HamanoMerge branch 'bd/maint-unpack-trees-parawalk-fix'
2010-06-22 Junio C HamanoMerge branch 'jc/rev-list-ancestry-path'
2010-06-22 Junio C HamanoMerge branch 'ic/maint-rebase-i-abort' into maint
2010-06-22 Junio C HamanoMerge branch 'cc/maint-commit-reflog-msg' into maint
2010-06-22 Junio C HamanoMerge branch 'jk/maint-advice-empty-amend' into maint
2010-06-22 Junio C HamanoMerge branch 'tc/commit-abbrev-fix' into maint
2010-06-22 Junio C HamanoMerge branch 'jn/document-rebase-i-p-limitation' into...
2010-06-22 Junio C HamanoMerge branch 'jn/checkout-doc' into maint
2010-06-22 Junio C HamanoMerge branch 'cc/maint-diff-CC-binary' into maint
2010-06-22 Junio C HamanoMerge branch 'jc/t9129-any-utf8' into maint
2010-06-22 Junio C HamanoMerge branch 'cb/ls-files-cdup' into maint
2010-06-22 Junio C HamanoMerge branch 'tc/merge-m-log' into maint
2010-06-22 Junio C HamanoMerge branch 'ph/clone-message-reword' into maint
2010-06-22 Junio C HamanoMerge branch 'jn/maint-amend-missing-name' 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 'cc/maint-commit-reflog-msg'
2010-06-21 Junio C HamanoMerge branch 'ic/maint-rebase-i-abort'
2010-06-21 Junio C HamanoMerge branch 'jk/maint-advice-empty-amend'
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 'jn/document-rebase-i-p-limitation'
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 'gv/portable'
2010-06-21 Junio C HamanoMerge branch 'jn/gitweb-fastcgi'
2010-06-21 Junio C HamanoMerge branch 'jn/checkout-doc'
2010-06-21 Junio C HamanoMerge branch 'maint'
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-21 Junio C HamanoMerge branch 'maint'
2010-06-18 Junio C HamanoMerge branch 'cc/maint-diff-CC-binary'
2010-06-18 Junio C HamanoMerge branch 'cb/ls-files-cdup'
2010-06-18 Junio C HamanoMerge branch 'jc/t9129-any-utf8'
2010-06-18 Junio C HamanoMerge branch 'ab/maint-perl-use-instlibdir'
2010-06-18 Junio C HamanoMerge branch 'rc/ls-remote-default'
2010-06-18 Junio C HamanoMerge branch 'hg/id-munging'
2010-06-18 Junio C HamanoMerge branch 'tc/merge-m-log'
2010-06-18 Junio C HamanoMerge branch 'ph/clone-message-reword'
2010-06-17 Junio C HamanoMerge 'maint' updates in
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
2010-06-16 Junio C HamanoMerge branch 'sp/maint-dumb-http-pack-reidx' into maint
next