merge-recursive: don't segfault while handling rename clashes
[gitweb.git] / diffcore-rename.c
2009-06-21 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-14 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-09 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-05-03 Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
2009-05-03 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-05-03 Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
2009-04-29 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-25 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-18 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-12 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-09 Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-09 Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
2009-04-09 Merge branch 'js/maint-1.6.0-exec-path-env' into maint...
2009-04-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-05 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-04-02 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-30 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-24 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-22 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-22 Merge branch 'js/maint-1.6.0-path-normalize' into maint...
2009-03-22 Merge branch 'jc/maint-1.6.0-pack-directory' into maint...
2009-03-13 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-03-13 Merge branch 'en/maint-1.6.1-hash-object' into maint...
2009-03-13 Merge branch 'js/maint-1.6.1-remote-remove-mirror'...
2009-03-13 Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted...
2009-03-13 Merge branch 'js/maint-1.6.1-rebase-i-submodule' into...
2009-03-13 Merge branch 'jc/maint-1.6.1-allow-uninteresting-missin...
2009-03-13 Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-13 Merge branch 'jk/maint-1.6.1-cleanup-after-exec-failure...
2009-02-28 Merge branch 'maint-1.6.0' into maint
2009-02-12 Merge branch 'maint-1.6.0' into maint
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'maint-1.5.5' into maint-1.5.6
2009-02-11 Merge branch 'maint-1.5.4' into maint-1.5.5
2009-02-10 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'jc/maint-apply-fix' into maint
2009-02-06 Merge branch 'am/maint-push-doc' into maint
2009-02-06 Merge branch 'sg/maint-gitdir-in-subdir' into maint
2009-02-06 Merge branch 'lt/maint-wrap-zlib' into maint
2009-02-06 Merge branch 'jc/maint-split-diff-metainfo' into maint
2009-02-06 Merge branch 'js/maint-all-implies-HEAD' into maint
2009-02-06 Merge branch 'kc/maint-diff-bwi-fix' into maint
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-03 Merge branch 'maint-1.6.0' into maint
2009-02-01 Merge branch 'maint-1.6.0' into maint
2009-01-29 Merge branch 'jc/maint-format-patch-o-relative' into...
2009-01-29 Merge branch 'bs/maint-rename-populate-filespec' into...
2009-01-24 Merge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24 Merge branch 'tr/maint-no-index-fixes' into maint
2009-01-21 Rename detection: Avoid repeated filespec population
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-17 GIT 1.5.6.6 v1.5.6.6
2008-12-17 GIT 1.5.5.6 v1.5.5.6
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-11-29 Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge branch 'jn/gitweb-customlinks'
2008-11-13 Merge branch 'gb/gitweb-snapshot-pathinfo'
2008-11-13 Merge branch 'jk/diff-convfilter'
2008-11-13 Merge branch 'jk/diff-convfilter-test-fix'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-09 Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Merge branch 'ar/maint-mksnpath' into maint
2008-11-09 Merge branch 'mv/maint-branch-m-symref' into maint
2008-11-09 Merge branch 'rs/blame'
2008-11-05 Merge branch 'ar/mksnpath'
2008-11-05 Merge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05 Merge branch 'mv/maint-branch-m-symref'
2008-11-05 Merge branch 'mv/parseopt-checkout-index'
2008-11-03 Merge branch 'np/index-pack'
2008-11-03 Merge branch 'sh/rebase-i-p'
2008-11-03 Merge branch 'ag/blame-encoding'
2008-11-03 Merge branch 'gb/gitweb-pathinfo'
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Merge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Merge branch 'jk/maint-ls-files-other' into maint
2008-11-02 Merge branch 'jc/maint-reset-remove-unmerged-new' into...
2008-11-02 Merge branch 'jc/maint-co-track' into maint
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-31 Merge branch 'maint'
2008-10-28 Add file delete/create info when we overflow rename_limit
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-09-25 Merge git://repo.or.cz/git-gui
next