refactor duplicated fill_mm() in checkout and merge-recursive
[git/git.git] / merge-recursive.c
2010-02-17 Michael Lukashovrefactor duplicated fill_mm() in checkout and merge...
2010-02-12 Junio C HamanoMerge branch 'maint'
2010-02-12 Junio C HamanoMerge branch 'maint'
2010-02-10 Junio C HamanoSync with 1.6.6.2
2010-02-10 Junio C HamanoMerge branch 'maint-1.6.5' into maint
2010-02-10 Junio C HamanoMerge branch 'gp/maint-cvsserver' into maint
2010-02-10 Junio C HamanoMerge branch 'jc/maint-reflog-bad-timestamp' into maint
2010-02-10 Junio C HamanoMerge branch 'il/maint-xmallocz' into maint
2010-02-10 Junio C HamanoMerge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Junio C HamanoMerge branch 'nd/include-termios-for-osol' into maint
2010-02-10 Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-10 Junio C HamanoMerge branch 'rs/maint-archive-match-pathspec' into...
2010-02-09 Junio C HamanoMerge branch 'maint'
2010-02-09 Junio C HamanoMerge branch 'maint-1.6.5' into maint
2010-02-09 Junio C HamanoMerge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Junio C HamanoMerge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Junio C HamanoMerge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-07 Junio C HamanoMerge branch 'maint'
2010-02-06 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-02-06 Junio C HamanoMerge branch 'maint'
2010-02-05 Junio C HamanoMerge branch 'jc/maint-limit-note-output' into maint
2010-02-01 Junio C HamanoMerge branch 'sp/maint-fast-import-large-blob' into...
2010-02-01 Junio C HamanoMerge branch 'bg/maint-add-all-doc' into maint-1.6.5
2010-01-30 Junio C HamanoMerge branch 'maint'
2010-01-30 Junio C HamanoMerge branch 'maint-1.6.5' into maint
2010-01-29 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-28 Junio C HamanoMerge branch 'maint'
2010-01-28 Junio C HamanoMerge branch 'gp/maint-cvsserver'
2010-01-27 Junio C HamanoMerge branch 'jc/maint-reflog-bad-timestamp'
2010-01-27 Junio C HamanoMerge branch 'il/maint-colon-address'
2010-01-27 Junio C HamanoMerge branch 'il/maint-xmallocz'
2010-01-27 Junio C HamanoMerge branch 'jh/maint-config-file-prefix'
2010-01-25 Junio C HamanoMerge branch 'jc/fix-tree-walk'
2010-01-24 Junio C HamanoMerge branch 'maint'
2010-01-24 Junio C HamanoMerge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-24 Junio C HamanoMerge branch 'doc-style/for-next' of git://repo.or...
2010-01-23 Junio C HamanoMerge branch 'maint'
2010-01-23 Junio C HamanoMerge branch 'jc/branch-d'
2010-01-23 Junio C HamanoMerge branch 'il/rev-glob'
2010-01-23 Junio C HamanoMerge branch 'js/refer-upstream'
2010-01-23 Junio C HamanoMerge branch 'jl/submodule-diff'
2010-01-23 Junio C HamanoMerge branch 'il/remote-updates'
2010-01-23 Junio C HamanoMerge branch 'il/branch-set-upstream'
2010-01-23 Junio C HamanoMerge branch 'jc/maint-limit-note-output'
2010-01-23 Junio C HamanoMerge branch 'nd/ls-files-sparse-fix'
2010-01-22 Junio C HamanoMerge branch 'maint'
2010-01-22 Junio C Hamanomerge-recursive: do not return NULL only to cause segfault
2010-01-21 Junio C HamanoMerge branch 'bw/cvsimport'
2010-01-21 Junio C HamanoMerge branch 'jc/checkout-merge-base'
2010-01-21 Junio C HamanoMerge branch 'ag/patch-header-verify'
2010-01-21 Junio C HamanoMerge branch 'jc/conflict-marker-size'
2010-01-21 Junio C HamanoMerge branch 'ag/maint-apply-too-large-p'
2010-01-21 Junio C HamanoMerge branch 'ap/merge-backend-opts'
2010-01-20 Junio C HamanoMerge branch 'bg/maint-remote-update-default' into...
2010-01-20 Junio C HamanoMerge branch 'sb/maint-octopus' into maint
2010-01-20 Junio C HamanoMerge branch 'bg/maint-add-all-doc' into maint
2010-01-20 Junio C HamanoMerge branch 'maint-1.6.5' into maint
2010-01-20 Junio C HamanoMerge branch 'jk/maint-1.6.5-reset-hard' into maint...
2010-01-19 Junio C HamanoMerge branch 'maint-1.6.4' into maint-1.6.5
2010-01-19 Junio C HamanoMerge branch 'maint-1.6.3' into maint-1.6.4
2010-01-19 Junio C HamanoMerge branch 'maint-1.6.2' into maint-1.6.3
2010-01-19 Junio C HamanoMerge branch 'dp/maint-1.6.5-fast-import-non-commit...
2010-01-19 Junio C HamanoMerge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
2010-01-18 Junio C HamanoMake "subtree" part more orthogonal to the rest of...
2010-01-18 Avery Pennarungit merge -X<option>
2010-01-17 Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-13 Junio C HamanoMerge branch 'jc/checkout-merge-base'
2010-01-13 Junio C HamanoMerge branch 'nd/sparse'
2010-01-12 Junio C HamanoMerge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10 Junio C HamanoMerge branch 'tr/http-updates'
2010-01-10 Junio C HamanoMerge branch 'jk/maint-1.6.5-reset-hard'
2010-01-10 Junio C HamanoMerge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
2010-01-10 Junio C HamanoMerge branch 'bg/maint-remote-update-default'
2010-01-10 Junio C HamanoMerge branch 'maint-1.6.2' into maint
2010-01-10 Junio C HamanoMerge branch 'maint-1.6.1' into maint-1.6.2
2010-01-10 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2010-01-07 Junio C HamanoMerge branch 'js/filter-branch-prime'
2010-01-07 Junio C HamanoMerge branch 'sb/maint-octopus'
2010-01-07 Junio C HamanoMerge branch 'bg/maint-add-all-doc'
2010-01-07 Junio C HamanoMerge branch 'mo/bin-wrappers'
2009-12-31 Junio C HamanoMerge branch 'maint-1.6.0' into maint
2009-12-30 Junio C HamanoMerge branch 'maint-1.6.1' into maint
2009-12-30 Junio C HamanoMerge branch 'maint-1.6.0' into maint-1.6.1
2009-12-28 Junio C HamanoMerge branch 'jk/1.7.0-status'
2009-12-27 Junio C HamanoMerge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-26 Junio C HamanoMerge branch 'gb/1.7.0-diff-whitespace-only-output'
2009-12-26 Junio C HamanoMerge branch 'jc/1.7.0-diff-whitespace-only-status'
2009-12-26 Junio C HamanoMerge branch 'jc/1.7.0-push-safety'
2009-12-26 Junio C HamanoMerge branch 'jc/1.7.0-send-email-no-thread-default'
2009-12-26 Junio C HamanoMerge branch 'sr/vcs-helper'
2009-12-22 Junio C HamanoMerge branch 'maint'
2009-12-20 Junio C HamanoMerge branch 'maint'
2009-12-16 Junio C HamanoMerge branch 'maint' to sync with 1.6.5.7
2009-12-11 Junio C HamanoSync with 1.6.5.6
2009-12-09 Junio C HamanoMerge git://repo.or.cz/git-gui
2009-12-09 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-09 Junio C HamanoMerge branch 'maint'
2009-12-09 Junio C HamanoMerge branch 'mm/maint-merge-ff-error-message-fix'...
2009-12-09 Junio C HamanoMerge branch 'jn/maint-pull-rebase-error-message' into...
next