merge-recursive: don't segfault while handling rename clashes
[gitweb.git] / userdiff.h
2008-11-13 Merge branch 'bc/maint-keep-pack'
2008-11-13 Merge branch 'mv/remote-rename'
2008-11-13 Merge branch 'jk/deny-push-to-current'
2008-11-13 Merge branch 'dl/xdiff'
2008-11-13 Merge branch 'lt/decorate'
2008-11-13 Merge branch 'jk/diff-convfilter'
2008-11-13 Merge branch 'st/tag'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-12 Merge branch 'maint'
2008-11-12 Merge branch 'jk/maint-commit-v-strip' into jk/commit...
2008-11-11 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'rs/blame'
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-04 Merge branch 'maint'
2008-11-03 Merge branch 'maint'
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 'maint'
2008-11-02 Merge git://repo.or.cz/git-gui
2008-10-31 Merge branch 'maint'
2008-10-31 Merge branch 'ar/maint-mksnpath' into ar/mksnpath
2008-10-27 Merge branch 'ar/maint-mksnpath' into HEAD
2008-10-26 Merge branch 'maint'
2008-10-26 userdiff: require explicitly allowing textconv
2008-10-22 Merge branch 'jk/diff-convfilter'
2008-10-18 diff: add filter for converting binary to text
2008-10-18 diff: introduce diff.<driver>.binary
2008-10-18 diff: unify external diff and funcname parsing code