merge: loosen overcautious "working file will be lost" check.
[gitweb.git] / diffcore-rename.c
2006-10-17 Merge branch 'maint'
2006-10-02 Merge branch 'maint'
2006-10-01 Merge branch 'maint'
2006-10-01 Merge branch 'jc/gitpm'
2006-09-18 Merge part of branch 'jc/upload-pack'
2006-09-14 Merge branches 'maint' and 'jc/http'
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28 Merge branch 'js/c-merge-recursive'
2006-08-28 Merge branch 'jc/apply'
2006-08-26 Merge branch 'master' into gl/web
2006-08-23 Merge branch 'gl/cleanup' into gl/cleanup-next
2006-08-21 Merge branch 'maint'
2006-08-17 Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded...
2006-08-13 Merge branch 'jc/upload-pack'
2006-08-13 Merge branch 'th/diff-extra'
2006-08-13 Merge branch 'jc/pack-objects'
2006-08-13 Merge branch 'js/read-tree'
2006-08-13 Merge branch 'jn/web'
2006-08-13 Merge branch 'lt/web'
2006-08-13 Merge branch 'jn/conf'
2006-08-13 Merge branch 'ml/pager'
2006-08-13 Merge branch 'master' into js/c-merge-recursive
2006-08-13 GIT 1.4.2 v1.4.2
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-12 Merge branch 'rj/header'
2006-08-08 Merge branch 'master' into pb/gitpm
2006-08-04 Merge branch 'jc/c99'
2006-08-03 Merge branch 'jc/sideband'
2006-08-03 diff.c: do not use pathname comparison to tell renames
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'
2006-07-13 Merge branch 'lt/merge-tree'
2006-07-10 Merge branch 'jc/show-merge'
2006-07-10 Merge branch 'lt/gitweb'
2006-07-10 Merge branch 'jc/rename'
2006-07-07 diffcore-rename: try matching up renames without popula...
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-09 diffcore-rename: fix merging back a broken pair.
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Merge branch 'maint'
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Merge branch 'fix'
2006-04-04 Merge branch 'lt/fix-sol-pack'
2006-04-04 Merge branch 'lt/fix-sol-pack' into next
2006-04-02 Merge branch 'lt/fix-sol-pack' into next
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-28 Merge branch ak/svn
2006-03-27 Merge branch 'lt/diffgen' into next
2006-03-27 Merge branch 'master' into next
2006-03-26 Merge branch 'jc/thin' into next
2006-03-26 Merge branch 'lt/diffgen' into next
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26 Merge branch 'ew/email' into next
2006-03-26 Merge branch 'lt/diffgen' into next
2006-03-26 Merge branch 'rs/tar-tree' into next
2006-03-24 Merge branch 'jc/name' into next
2006-03-22 Merge branch 'jc/pull' into next
2006-03-22 Merge branch 'jc/revlist' into next
2006-03-22 Merge branch 'jc/clone' into next
2006-03-21 Merge branch 'jc/clone' into next
2006-03-21 Merge branch 'jc/name' into next
2006-03-21 Merge branch 'jc/name' into next
2006-03-21 Merge branch 'jc/clone' into next
2006-03-20 Merge branch 'jc/merge' into next
2006-03-20 Merge branch 'jc/clone' into next
2006-03-18 Merge branch 'master' into next
2006-03-18 Merge branch 'master' into next
2006-03-18 Merge branch 'jc/cvsimport' into next
2006-03-18 Merge branch 'master' into next
2006-03-17 Merge branch 'jc/cvsimport' into next
2006-03-17 Merge branch 'jc/fetch' into next
2006-03-17 Merge branch 'ew/abbrev' into next
2006-03-16 Merge branch 'master' into next
2006-03-15 Merge branch 'master' into next
2006-03-13 Merge branch 'jc/diff' into next
2006-03-13 Fix up diffcore-rename scoring
2006-03-13 Merge branch 'jc/diff' into next
2006-03-13 Merge branch 'jc/empty' into next
2006-03-13 diffcore-delta: make the hash a bit denser.
2006-03-12 Merge branch 'jc/empty' into next
2006-03-12 Merge branch 'master' into next
2006-03-12 Merge branch 'jc/diff' into next
2006-03-12 diffcore-rename: somewhat optimized.
2006-03-11 Merge branch 'nh/http' into next
2006-03-11 Merge branch 'ew/remote' into next
2006-03-11 Merge branch 'fk/blame' into next
2006-03-09 Merge branch 'jc/fsck' into next
2006-03-08 Merge branch 'master' into next
2006-03-07 Merge branch 'master' into next
2006-03-07 Merge branch 'jc/pack' into next
next