merge-recursive: introduce merge_options
[git/git.git] / merge-recursive.c
2008-08-31 Miklos Vajnamerge-recursive: introduce merge_options
2008-08-31 Stephan Beyermerge-recursive.c: Add more generic merge_recursive_gen...
2008-08-31 Miklos VajnaSplit out merge_recursive() to merge-recursive.c
2008-06-27 Junio C HamanoMerge branch 'maint-1.5.4' into maint-1.5.5
2008-05-26 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-23 Junio C HamanoMerge branch 'maint-1.5.4' into maint v1.5.5.2
2008-05-21 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-14 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-11 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-09 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-04 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-30 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-28 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-25 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-23 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-19 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-17 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-16 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-12 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-12 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-10 Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-09 Junio C HamanoMerge branch 'jc/rename'
2008-04-07 Junio C HamanoMerge branch 'jc/maint-apply-match-beginning'
2008-03-28 Junio C HamanoGIT 1.5.5-rc2 v1.5.5-rc2
2008-03-27 Junio C HamanoMerge branch 'maint'
2008-03-26 Junio C HamanoMerge branch 'jc/maint-fetch-regression-1.5.4'
2008-03-16 Junio C HamanoMerge branch 'maint'
2008-03-15 Junio C HamanoMerge branch 'maint'
2008-03-15 Junio C HamanoMerge branch 'maint'
2008-03-14 Junio C HamanoMerge branch 'maint'
2008-03-14 Junio C HamanoMerge branch 'ph/maint-quiltimport' into maint
2008-03-14 Clemens Buchachermerge-recursive: handle file mode changes
2008-03-13 Junio C HamanoMerge branch 'maint'
2008-03-12 Junio C HamanoMerge branch 'maint'
2008-03-11 Junio C HamanoMerge branch 'jc/cherry-pick' (early part)
2008-03-11 Junio C HamanoMerge branch 'maint'
2008-03-09 Junio C HamanoMerge branch 'kb/maint-filter-branch-disappear'
2008-03-09 Junio C HamanoMerge branch 'maint' to sync with 1.5.4.4
2008-03-08 Junio C HamanoMerge branch 'aw/maint-shortlog-blank-lines'
2008-03-08 Junio C HamanoMerge branch 'maint'
2008-03-06 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-04 Junio C HamanoMerge branch 'maint'
2008-03-03 Junio C HamanoMerge commit '74359821' into js/reflog-delete
2008-03-03 Junio C HamanoMerge branch 'maint'
2008-03-02 Junio C HamanoMerge branch 'pb/cvsimport'
2008-03-02 Junio C HamanoMerge branch 'jc/maint-log-merge-left-right'
2008-03-02 Junio C HamanoMerge branch 'mh/maint-http-proxy-fix'
2008-03-02 Junio C HamanoMerge branch 'cb/http-test'
2008-03-02 Junio C HamanoMerge branch 'jc/remote-multi-url'
2008-03-02 Junio C HamanoMerge branch 'jn/gitweb-grep'
2008-03-02 Junio C HamanoMerge branch 'mk/maint-parse-careful'
2008-03-02 Junio C HamanoMerge branch 'sb/describe-long'
2008-03-02 Junio C HamanoMerge branch 'ew/maint-svn-cert-fileprovider'
2008-03-02 Junio C HamanoMerge branch 'js/maint-daemon'
2008-03-01 Junio C HamanoMerge branch 'maint'
2008-03-01 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-29 Junio C HamanoMerge branch 'maint'
2008-02-27 Junio C HamanoMerge branch 'maint'
2008-02-27 Junio C HamanoMerge branch 'git-p4' of git://repo.or.cz/git/git-p4
2008-02-27 Junio C HamanoMerge branch 'jm/free'
2008-02-27 Junio C HamanoMerge branch 'db/checkout'
2008-02-27 Junio C HamanoMerge branch 'db/cover-letter'
2008-02-27 Junio C HamanoMerge branch 'js/merge'
2008-02-27 Junio C HamanoMerge branch 'jc/diff-relative'
2008-02-27 Junio C HamanoMerge branch 'db/host-alias'
2008-02-26 Junio C HamanoMerge branch 'maint'
2008-02-25 Junio C HamanoMerge branch 'lt/dirstat'
2008-02-25 Junio C HamanoMerge branch 'jc/apply-whitespace'
2008-02-24 Junio C HamanoMerge branch 'maint'
2008-02-23 Junio C HamanoSync with 1.5.4.3
2008-02-23 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Junio C HamanoMerge branch 'bc/reflog-fix' into js/reflog-delete
2008-02-22 Junio C HamanoMerge branch 'maint'
2008-02-21 Junio C HamanoMerge branch 'mk/color'
2008-02-21 Junio C HamanoMerge branch 'js/maint-cvsexport'
2008-02-21 Junio C HamanoMerge branch 'js/maint-http-push'
2008-02-21 Junio C HamanoMerge branch 'jk/empty-tree'
2008-02-21 Junio C HamanoMerge branch 'lt/revision-walker'
2008-02-21 Junio C HamanoMerge branch 'mc/prefix'
2008-02-21 Junio C HamanoMerge branch 'bc/fopen'
2008-02-21 Junio C HamanoMerge branch 'jc/setup'
2008-02-21 Junio C HamanoMerge branch 'maint'
2008-02-20 Junio C HamanoMerge branch 'maint'
2008-02-19 Junio C HamanoMerge branch 'mk/maint-parse-careful'
2008-02-18 Junio C Hamanomerge-recursive: split low-level merge functions out.
2008-02-18 Martin Koeglerderef_tag: handle return value NULL
2008-02-18 Junio C HamanoMerge branch 'br/gitweb'
2008-02-17 Junio C HamanoMerge branch 'maint'
2008-02-17 Junio C HamanoMerge branch 'bd/qsort'
2008-02-17 Junio C HamanoMerge branch 'sp/safecrlf'
2008-02-17 Junio C HamanoMerge branch 'cc/browser'
2008-02-17 Junio C HamanoMerge branch 'jc/gitignore-ends-with-slash'
2008-02-17 Junio C HamanoMerge branch 'pb/prepare-commit-msg'
2008-02-17 Junio C HamanoMerge branch 'jk/noetcconfig'
2008-02-17 Junio C HamanoMerge branch 'jc/submittingpatches'
2008-02-17 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-02-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-17 Junio C HamanoMerge branch 'maint'
2008-02-16 Junio C HamanoMerge branch 'maint'
2008-02-13 Junio C HamanoMerge branch 'maint'
next