merge-recursive: handle D/F conflict case more carefully.
[gitweb.git] / compat /
2007-03-22 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-20 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-05 Merge branch 'js/fetch-progress' (early part)
2007-03-02 Merge branch 'js/commit-format'
2007-02-28 Merge branch 'js/bundle'
2007-02-28 Merge branch 'mc/sendmail'
2007-02-27 Merge branch 'np/types' into jc/fetch
2007-02-26 Merge branch 'master' into js/diff-ni
2007-02-26 Merge branch 'jc/merge-symlink' into maint
2007-02-25 Merge git://repo.or.cz/git-gui into maint
2007-02-24 Merge branch 'js/apply'
2007-02-24 Merge branch 'js/no-limit-boundary'
2007-02-24 Merge branch 'js/etc-config'
2007-02-23 Merge branches 'lt/crlf' and 'jc/apply-config'
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-21 Merge branch 'fk/autoconf'
2007-02-21 Merge branch 'js/name-rev-fix'
2007-02-20 Merge branch 'js/diff-color-check'
2007-02-20 Merge branch 'jc/fetch-notags'
2007-02-20 Merge branch 'maint'
2007-02-20 Add a compat/strtoumax.c for Solaris 8.
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint
2007-02-14 Merge branch 'jc/diff-apply-patch'
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Merge git-gui
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-15 Merge branch 'master' of git://git./git/git
2007-01-14 Merge branch 'master' into sp/fast-import
2007-01-12 Merge branch 'jc/bare'
2007-01-12 Merge branch 'jc/detached-head'
2007-01-10 Merge branch 'js/reflog'
2007-01-10 Replacing the system call pread() with lseek()/xread...
2007-01-09 Merge branch 'maint'
2007-01-05 Merge branch 'maint'
2006-12-27 Merge branch 'master' into js/shallow
2006-12-27 Merge branch 'jc/fsck-reflog'
2006-12-25 Merge branch 'jc/skip-count'
2006-12-25 Merge branch 'jc/git-add--interactive'
2006-12-24 Merge branch 'sb/merge-friendly'
2006-12-24 Merge branch 'js/rerere'
2006-12-24 Switch git_mmap to use pread.
2006-12-24 Rename gitfakemmap to git_mmap.
2006-12-22 Merge branch 'maint'
2006-12-21 Merge branch 'ew/svn-pm'
2006-12-20 Merge branch 'jc/leftright'
2006-12-20 Merge branch 'jc/blame'
2006-12-20 Merge branch 'jc/branch-remove-remote'
2006-12-20 Merge branch 'jc/clone'
2006-12-20 compat/inet_ntop: do not use u_int
2006-12-20 Merge branch 'maint'
2006-12-20 simplify inclusion of system header files.
2006-12-14 Merge branch 'maint'
2006-12-13 Merge branch 'jc/commit-careful'
2006-12-13 Merge branch 'maint'
2006-12-13 Merge branch 'maint'
2006-12-11 Merge branch 'maint'
2006-12-07 Merge branch 'maint'
2006-12-06 Merge branch 'maint'
2006-12-05 Merge branch 'maint'
2006-12-03 Merge branch 'maint'
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk
2006-11-29 Merge branch 'maint'
2006-11-29 Merge branch 'jc/globfetch'
2006-11-29 Merge branch 'maint'
2006-11-27 Merge branch 'js/shortlog'
2006-11-27 Merge branch 'jc/push-delete-ref'
2006-11-27 Merge branch 'jc/merge'
2006-11-24 Merge branch 'jc/numstat'
2006-11-24 Merge branch 'jc/upload-pack'
2006-11-22 remove merge-recursive-old
2006-11-15 Seek back to current filepos when mmap()ing with NO_MMAP
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-10-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-23 Merge branch 'np/pack'
2006-10-17 Merge branch 'maint'
2006-10-02 Merge branch 'master' into lj/refs
2006-10-02 Merge branch 'maint'
2006-10-01 Merge branch 'maint'
2006-10-01 Merge branch 'sb/fetch' into jc/refs-and-fetch
2006-10-01 Merge branch 'jc/gitpm'
2006-10-01 Merge branch 'jc/diff-stat'
2006-10-01 Merge branch 'lt/web'
2006-09-28 Merge branch 'jl/virtual'
2006-09-28 Cleaned up git-daemon virtual hosting support.
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13 Merge branch 'jc/upload-pack'
2006-08-13 Merge branch 'th/diff-extra'
2006-08-13 GIT 1.4.2 v1.4.2
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08 Merge branch 'master' into pb/gitpm
2006-07-30 Merge branch 'jn/make'
2006-07-26 Merge branch 'pb/configure'
2006-07-13 Merge branch 'ml/trace'
2006-07-13 Merge branch 'js/merge-base'
2006-07-13 Merge branch 'lt/prune'
next