A new merge stragety 'subtree'.
[git/git.git] / merge-recursive.c
2007-04-07 Junio C HamanoA new merge stragety 'subtree'.
2007-04-07 Junio C HamanoMerge branch 'jc/index-output'
2007-04-07 Junio C HamanoMerge branch 'jc/checkout' (early part)
2007-04-07 Junio C HamanoMerge branch 'maint'
2007-04-05 Junio C HamanoMerge branch 'maint'
2007-04-05 Junio C HamanoFix bogus error message from merge-recursive error...
2007-04-04 Junio C HamanoMerge branch 'jc/bisect'
2007-04-04 Junio C HamanoMerge branch 'fl/doc'
2007-04-04 Junio C Hamano_GIT_INDEX_OUTPUT: allow plumbing to output to an alter...
2007-04-04 Junio C HamanoMerge 1.5.0.7 in
2007-03-31 Alex RiesenKeep rename/rename conflicts of intermediate merges...
2007-03-30 Junio C HamanoMerge branch 'maint'
2007-03-28 Junio C HamanoMerge branch 'maint' to synchronize with 1.5.0.6
2007-03-25 Junio C HamanoMerge branch 'maint'
2007-03-25 Junio C HamanoMerge branch 'maint'
2007-03-24 Junio C HamanoMerge branch 'maint'
2007-03-22 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-22 Junio C HamanoMerge branch 'maint'
2007-03-20 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-18 Junio C HamanoMerge 1.5.0.5 in from 'maint'
2007-03-17 Junio C HamanoMerge branch 'maint'
2007-03-14 Junio C HamanoMerge GIT 1.5.0.4
2007-03-14 Junio C HamanoMerge branch 'jc/fetch'
2007-03-14 Junio C HamanoMerge branch 'maint'
2007-03-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-03-13 Junio C HamanoMerge branch 'maint'
2007-03-12 Shawn O. PearceMerge branch 'maint'
2007-03-12 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-12 Junio C HamanoMerge branch 'maint'
2007-03-11 Junio C HamanoMerge branch 'js/diff-ni'
2007-03-11 Junio C HamanoMerge branch 'js/revert-cherry'
2007-03-11 Junio C HamanoMerge branch 'maint'
2007-03-08 Junio C HamanoMerge branch 'js/config-rename'
2007-03-07 Junio C HamanoMerge branch 'maint'
2007-03-06 Junio C HamanoMerge branch 'maint'
2007-03-06 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-06 Junio C HamanoMerge branch 'maint'
2007-03-06 Junio C HamanoMerge branch 'master-for-junio' of git://repo.or.cz...
2007-03-05 Shawn O. PearceMerge branch 'maint'
2007-03-05 Junio C HamanoMerge branch 'js/fetch-progress' (early part)
2007-03-05 Junio C HamanoMerge branch 'js/symlink'
2007-03-05 Junio C HamanoMerge branch 'maint'
2007-03-04 Junio C HamanoMerge branch 'maint'
2007-03-04 Johannes SixtHandle core.symlinks=false case in merge-recursive.
2007-03-03 Junio C HamanoMerge branch 'maint'
2007-03-02 Junio C HamanoMerge branch 'js/commit-format'
2007-03-02 Junio C HamanoMerge branch 'maint'
2007-02-28 Junio C HamanoMerge branch 'js/commit-by-name'
2007-02-28 Junio C HamanoMerge branch 'js/bundle'
2007-02-28 Junio C HamanoMerge branch 'maint'
2007-02-28 Junio C HamanoMerge branch 'np/types'
2007-02-28 Junio C HamanoMerge branch 'mc/sendmail'
2007-02-27 Junio C HamanoMerge branch 'np/types' into jc/fetch
2007-02-27 Nicolas Pitreconvert object type handling from a string to a number
2007-02-26 Junio C HamanoMerge branch 'master' into js/diff-ni
2007-02-26 Junio C HamanoMerge branch 'maint'
2007-02-26 Junio C HamanoMerge branch 'jc/merge-symlink' into maint
2007-02-26 Junio C Hamanomerge-recursive: fix longstanding bug in merging symlinks
2007-02-25 Junio C HamanoMerge git://repo.or.cz/git-gui into maint
2007-02-21 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18 Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint
2007-02-14 Junio C HamanoMerge branch 'js/reverse'
2007-02-14 Junio C HamanoMerge branch 'jc/diff-apply-patch'
2007-02-14 Junio C HamanoMerge branch 'jc/merge-base' (early part)
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Junio C HamanoMerge git-gui
2007-02-08 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-07 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-07 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-05 Junio C HamanoUse pretend_sha1_file() in git-blame and git-merge...
2007-02-04 Junio C HamanoMerge branch 'master' into np/dreflog
2007-02-04 Shawn O. PearceKeep untracked files not involved in a merge.
2007-02-04 Pavel RoskinAssorted typo fixes
2007-01-31 Junio C HamanoMerge branch 'master' of git://linux-nfs.org/~bfields/git
2007-01-30 Shawn O. PearceMerge branch 'master' into sp/gfi
2007-01-15 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-15 J. Bruce FieldsMerge branch 'master' of git://git./git/git
2007-01-14 Shawn O. PearceConvert output messages in merge-recursive to past...
2007-01-14 Shawn O. PearceDisplay a progress meter during merge-recursive.
2007-01-14 Shawn O. PearceEnable output buffering in merge-recursive.
2007-01-14 Shawn O. PearceAllow the user to control the verbosity of merge-recursive.
2007-01-14 Shawn O. PearceRemove unnecessary call_depth parameter in merge-recursive.
2007-01-14 Junio C HamanoMerge branch 'sp/merge' (early part)
2007-01-14 Shawn O. PearceMerge branch 'master' into sp/fast-import
2007-01-12 Junio C Hamanomerge-recursive: do not report the resulting tree objec...
2007-01-12 Junio C HamanoMerge branch 'jc/bare'
2007-01-12 Junio C HamanoMerge branch 'ar/merge-recursive'
2007-01-12 Junio C HamanoMerge branch 'jc/detached-head'
2007-01-10 Junio C Hamanomerge-recursive: do not use on-file index when not...
2007-01-10 Alex RiesenSpeed-up recursive by flushing index only once for...
2007-01-09 Junio C HamanoMerge branch 'maint'
2007-01-08 Junio C HamanoMerge branch 'jc/reflog'
2007-01-08 Andy Whitcroftshort i/o: fix calls to write to use xwrite or write_in...
2007-01-07 Junio C HamanoMerge branch 'sp/mmap'
2007-01-05 Junio C HamanoMerge branch 'maint'
2007-01-01 Junio C HamanoMerge branch 'sp/merge' (early part)
2006-12-29 Shawn O. PearceAllow merging bare trees in merge-recursive.
2006-12-29 Shawn O. PearceMove better_branch_name above get_ref in merge-recursive.
2006-12-27 Junio C HamanoMerge branch 'master' into js/shallow
next