merge-recursive: introduce merge_options
[git/git.git] / builtin-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-08-31 Junio C HamanoMerge branch 'maint'
2008-08-30 Junio C HamanoMerge branch 'sb/daemon'
2008-08-29 Junio C HamanoMerge branch 'maint'
2008-08-28 Junio C HamanoMerge branch 'mv/merge-custom'
2008-08-28 Junio C HamanoMerge branch 'ml/submodule'
2008-08-27 Junio C HamanoMerge branch 'am/cherry-pick-rerere'
2008-08-27 Junio C HamanoMerge branch 'jc/add-addremove'
2008-08-27 Junio C HamanoMerge branch 'np/verify-pack'
2008-08-27 Junio C HamanoMerge branch 'maint'
2008-08-27 Junio C HamanoMerge branch 'af/maint-install-no-handlink'
2008-08-27 Junio C HamanoMerge branch 'jc/no-slim-shell'
2008-08-27 Junio C HamanoMerge branch 'maint'
2008-08-24 Junio C HamanoMerge branch 'jc/no-slim-shell'
2008-08-24 Junio C HamanoMerge branch 'maint' to sync with 1.6.0.1
2008-08-24 Junio C HamanoMerge branch 'maint'
2008-08-22 Jonathan del StrotherRevert "Convert output messages in merge-recursive...
2008-08-20 Junio C HamanoMerge branch 'ph/enable-threaded'
2008-08-17 Junio C HamanoMerge git-gui 0.11.0
2008-08-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Junio C HamanoMerge branch 'maint'
2008-08-13 Junio C HamanoMerge branch 'maint'
2008-08-12 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-09 Junio C HamanoMerge branch 'maint'
2008-08-07 Junio C HamanoMerge branch 'lt/config-fsync' into maint
2008-08-07 Junio C HamanoMerge branch 'jc/reflog-expire' into maint
2008-08-06 Junio C HamanoSync with 1.5.6.5
2008-08-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-08-06 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Junio C HamanoMerge branch 'maint'
2008-08-03 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-07-30 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-27 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-25 Junio C HamanoMerge branch 'maint'
2008-07-24 Junio C HamanoMerge branch 'maint' into ph/checkout
2008-07-22 Johannes SchindelinRename path_list to string_list
2008-07-21 Junio C HamanoMerge branch 'ap/trackinfo' v1.6.0-rc0
2008-07-21 Junio C HamanoMerge branch 'jc/rerere-auto-more'
2008-07-21 Junio C HamanoMerge branch 'ns/am-abort'
2008-07-21 Junio C HamanoMerge branch 'maint'
2008-07-19 Junio C HamanoMerge branch 'maint'
2008-07-17 Junio C HamanoMerge branch 'mv/dashless'
2008-07-17 Junio C HamanoMerge branch 'ls/mailinfo'
2008-07-17 Junio C HamanoMerge branch 'sb/dashless'
2008-07-17 Junio C HamanoMerge branch 'rs/archive'
2008-07-17 Junio C HamanoMerge branch 'ag/blame'
2008-07-17 Junio C HamanoMerge branch 'rs/rebase-checkout-not-so-quiet'
2008-07-17 Junio C HamanoMerge branch 'sp/maint-index-pack'
2008-07-17 Junio C HamanoMerge branch 'maint'
2008-07-16 Junio C HamanoMerge branch 'mv/merge-in-c'
2008-07-15 René Scharfeadd context pointer to read_tree_recursive()
2008-07-15 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-15 Junio C HamanoMerge branch 'jc/branch-merged'
2008-07-13 Junio C HamanoMerge branch 'ph/parseopt-step-blame'
2008-07-09 Junio C HamanoMerge branch 'jc/reflog-expire'
2008-07-08 Junio C HamanoMerge branch 'jc/blame' (early part) into HEAD
2008-07-08 Junio C HamanoMerge branch 'lt/racy-empty' into maint
2008-07-07 Junio C HamanoMerge branch 'jc/rerere'
2008-07-07 Junio C HamanoMerge branch 'dr/ceiling'
2008-07-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-03 Junio C HamanoMerge branch 'j6t/mingw'
2008-07-03 Junio C HamanoMerge branch 'jc/maint-reset' into maint
2008-07-01 Junio C HamanoMerge branch 'ph/mergetool'
2008-07-01 Junio C HamanoMerge branch 'jc/maint-reset'
2008-07-01 Junio C HamanoMerge branch 'jc/dashless' (early part)
2008-07-01 Junio C HamanoMerge branch 'nd/dashless'
2008-07-01 Miklos VajnaMove commit_list_count() to commit.c
2008-06-27 Junio C HamanoMerge branch 'maint-1.5.5' into maint
2008-06-27 Junio C HamanoMerge branch 'maint-1.5.4' into maint-1.5.5
2008-06-25 Junio C HamanoMerge branch 'sb/rebase'
2008-06-25 Junio C HamanoMerge branch 'lw/gitweb'
2008-06-25 Junio C HamanoMerge branch 'lt/config-fsync'
2008-06-25 Junio C HamanoMerge branch 'sr/tests'
2008-06-25 Junio C HamanoMerge branch 'jh/clone-packed-refs'
2008-06-25 Junio C HamanoMerge branch 'lw/perlish'
2008-06-25 Jeff Kingclone: create intermediate directories of destination...
2008-06-25 Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-25 Jeff Kingclone: create intermediate directories of destination...
2008-06-22 Junio C HamanoMerge branch 'rs/archive-ignore'
2008-06-22 Junio C HamanoMerge branch 'lt/racy-empty'
2008-06-22 Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context'
2008-06-22 Junio C HamanoMerge branch 'mo/status-untracked'
2008-06-22 Junio C HamanoMerge branch 'kh/update-ref'
2008-06-22 Junio C HamanoMerge branch 'rg/gitweb'
2008-06-17 Junio C HamanoMerge branch 'maint'
2008-06-16 Junio C HamanoMerge branch 'maint'
2008-06-14 Junio C HamanoMerge branch 'rs/attr'
2008-06-11 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-11 Junio C HamanoMerge branch 'maint'
2008-06-09 Junio C HamanoMerge branch 'js/merge-recursive'
2008-06-09 Junio C HamanoMerge branch 'maint'
2008-06-09 Johannes Schindelinmerge-recursive: respect core.autocrlf when writing...
2008-06-07 Junio C HamanoMerge 1.5.5.4 in
2008-06-06 Junio C HamanoMerge branch 'maint'
next