merge-recursive: mark rename/delete conflict as unmerged
[git] / diff.c
2008-10-19  Junio C HamanoMerge branch 'mv/merge-noff'
2008-10-19  Junio C HamanoMerge branch 'ns/rebase-noverify'
2008-10-19  Junio C HamanoMerge branch 'maint'
2008-10-18  Junio C HamanoMerge branch 'maint'
2008-10-18  Junio C HamanoMerge branch 'db/maint-checkout-b' into maint
2008-10-18  Jeff Kingdiff: add filter for converting binary to text
2008-10-18  Jeff Kingdiff: introduce diff.<driver>.binary
2008-10-18  Jeff Kingdiff: unify external diff and funcname parsing code
2008-10-18  Junio C HamanoMerge branch 'pb/commit-where'
2008-10-17  Junio C HamanoMerge branch 'jk/maint-ls-files-other' into jk/fix...
2008-10-17  Junio C HamanoMerge branch 'maint'
2008-10-13  Junio C HamanoMerge branch 'maint'
2008-10-12  Shawn O. PearceMerge branch 'maint'
2008-10-12  Brandon CaseyReplace calls to strbuf_init(&foo, 0) with STRBUF_INIT...
2008-10-10  Shawn O. PearceMerge branch 'maint'
2008-10-09  Shawn O. PearceMerge branch 'js/objc-funchdr'
2008-10-09  Shawn O. PearceMerge branch 'pb/gitweb'
2008-10-09  Shawn O. PearceMerge branch 'bc/xdiffnl'
2008-10-09  Shawn O. PearceMerge branch 'dp/cywginstat'
2008-10-09  Shawn O. PearceMerge branch 'lt/time-reject-fractional-seconds'
2008-10-09  Shawn O. PearceMerge branch 'jc/add-ita'
2008-10-09  Shawn O. PearceMerge branch 'mw/sendemail'
2008-10-09  Shawn O. PearceMerge branch 'mv/merge-refresh'
2008-10-09  Shawn O. PearceMerge branch 'ph/parseopt'
2008-10-09  Shawn O. PearceMerge branch 'rz/grepz'
2008-10-09  Shawn O. PearceMerge branch 'mg/verboseprune'
2008-10-09  Shawn O. PearceMerge branch 'maint'
2008-10-09  Shawn O. PearceMerge branch 'sg/maint-intrebase-msghook' into maint
2008-10-09  Shawn O. PearceMerge branch 'jk/maint-soliconv' into maint
2008-10-08  Shawn O. PearceMerge branch 'maint'
2008-10-06  Jonathan del StrotherTeach git diff about Objective-C syntax
2008-10-06  Shawn O. PearceMerge branch 'maint'
2008-10-06  Linus Torvaldsfix bogus "diff --git" header from "diff --no-index"
2008-10-03  Shawn O. PearceMerge branch 'pb/gitweb-tagcloud' into pb/gitweb
2008-10-03  Shawn O. PearceMerge branch 'maint'
2008-10-03  Nicolas Pitrefix openssl headers conflicting with custom SHA1 implem...
2008-10-01  Shawn O. PearceMerge branch 'maint'
2008-09-30  Shawn O. PearceMerge branch 'maint'
2008-09-30  Brandon Caseydiff.c: remove duplicate bibtex pattern introduced...
2008-09-29  Shawn O. PearceMerge branch 'bc/master-diff-hunk-header-fix'
2008-09-29  Shawn O. PearceMerge branch 'maint' into bc/master-diff-hunk-header-fix
2008-09-29  Shawn O. PearceMerge branch 'bc/maint-diff-hunk-header-fix' into maint
2008-09-29  Shawn O. PearceMerge branch 'jc/better-conflict-resolution'
2008-09-29  Shawn O. PearceMerge branch 'mg/maint-remote-fix' into maint
2008-09-26  Shawn O. PearceMerge branch 'maint'
2008-09-25  Shawn O. PearceMerge branch 'mv/merge-recursive'
2008-09-25  Shawn O. PearceMerge branch 'jc/alternate-push'
2008-09-25  Shawn O. PearceMerge branch 'am/status'
2008-09-25  Shawn O. PearceMerge branch 'pb/autocorrect-wrapper'
2008-09-25  Shawn O. PearceMerge branch 'mv/commit-tree'
2008-09-25  Shawn O. PearceMerge branch 'jc/apply-include-exclude'
2008-09-25  Shawn O. PearceMerge branch 'jc/safe-c-l-d'
2008-09-25  Shawn O. PearceMerge branch 'ho/dirstat-by-file'
2008-09-25  Shawn O. PearceMerge git://repo.or.cz/git-gui
2008-09-25  Shawn O. PearceMerge branch 'maint'
2008-09-23  Junio C HamanoMerge branch 'maint'
2008-09-23  Brandon Caseyt4018-diff-funcname: test syntax of builtin xfuncname...
2008-09-23  Junio C HamanoMerge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-22  Junio C HamanoMerge branch 'maint'
2008-09-22  Junio C HamanoMerge branch 'db/maint-checkout-b'
2008-09-21  Junio C HamanoMerge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-20  Junio C Hamanodiff hunk pattern: fix misconverted "\{" tex macro...
2008-09-20  Junio C Hamanodiff: fix "multiple regexp" semantics to find hunk...
2008-09-20  Junio C Hamanodiff: use extended regexp to find hunk headers
2008-09-20  Junio C HamanoMerge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-20  Junio C Hamanodiff: use extended regexp to find hunk headers
2008-09-20  Junio C HamanoMerge branch 'maint'
2008-09-19  Junio C HamanoMerge branch 'bc/maint-diff-hunk-header-fix' into bc...
2008-09-19  Junio C HamanoMerge branch 'maint'
2008-09-19  Junio C HamanoMerge branch 'jc/diff-prefix'
2008-09-19  Junio C HamanoMerge branch 'np/pack'
2008-09-19  Junio C HamanoMerge branch 'bw/shortref'
2008-09-19  Junio C HamanoMerge branch 'rs/decorate'
2008-09-19  Junio C HamanoMerge branch 'tr/rev-list-reverse'
2008-09-19  Junio C HamanoMerge branch 'cc/bisect'
2008-09-19  Junio C HamanoMerge branch 'jc/setlinebuf-setvbuf'
2008-09-19  Brandon Caseydiff.*.xfuncname which uses "extended" regex's for...
2008-09-19  Brandon Caseydiff.c: associate a flag with each pattern and use...
2008-09-19  Brandon Caseydiff.c: return pattern entry pointer rather than just...
2008-09-19  Junio C HamanoMerge branch 'dp/maint-rebase-fix' into maint
2008-09-19  Junio C HamanoMerge branch 'jc/maint-checkout-keep-remove' into maint
2008-09-19  Junio C HamanoMerge branch 'jc/maint-diff-quiet' into maint
2008-09-19  Junio C HamanoMerge branch 'jc/maint-name-hash-clear' into maint
2008-09-19  Junio C HamanoMerge branch 'jc/maint-template-permbits' into maint
2008-09-19  Junio C HamanoMerge branch 'mh/maint-honor-no-ssl-verify' into maint
2008-09-16  Junio C HamanoMerge branch 'maint'
2008-09-16  Junio C HamanoMerge branch 'dp/maint-rebase-fix'
2008-09-16  Junio C HamanoMerge branch 'jc/maint-checkout-keep-remove'
2008-09-16  Junio C HamanoMerge branch 'jc/maint-diff-quiet'
2008-09-16  Junio C HamanoMerge branch 'jc/maint-name-hash-clear'
2008-09-16  Junio C HamanoMerge branch 'jc/maint-template-permbits'
2008-09-16  Junio C HamanoMerge branch 'mh/maint-honor-no-ssl-verify'
2008-09-13  Junio C HamanoSync with 1.6.0.2
2008-09-12  Junio C HamanoMerge branch 'ho/maint-dashless' into maint
2008-09-10  Junio C HamanoMerge branch 'maint'
2008-09-10  Junio C HamanoMerge branch 'jc/maint-log-grep' into maint
2008-09-10  Junio C HamanoMerge branch 'jc/maint-hide-cr-in-diff-from-less' into...
2008-09-10  Junio C HamanoMerge branch 'jc/maint-checkout-fix' into maint
2008-09-10  Junio C HamanoMerge branch 'np/maint-safer-pack' into maint
2008-09-10  Junio C HamanoMerge branch 'ho/dashless'
next