t6022: Add tests for rename/rename combined with D/F conflicts
[gitweb.git] / xdiff / xprepare.c
2009-03-22 Merge branch 'maint-1.6.1' into maint
2009-03-22 Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
2009-03-22 Merge branch 'mg/maint-submodule-normalize-path' into...
2009-03-22 Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-18 Merge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-18 Merge branch 'tr/maint-1.6.0-send-email-irt'
2009-03-13 Merge branch 'maint-1.6.1' into maint
2009-03-11 Merge branch 'fg/maint-exclude-bq' into maint
2009-03-11 Merge branch 'en/maint-hash-object' into maint
2009-03-11 Merge branch 'mg/maint-submodule-normalize-path'
2009-03-11 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-08 Merge branch 'maint-1.6.1' into maint
2009-03-05 Merge branch 'en/maint-hash-object'
2009-03-05 Merge branch 'jc/blame'
2009-03-05 Merge branch 'fg/exclude-bq'
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-01 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-28 Merge branch 'maint'
2009-02-28 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-27 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-25 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-20 Merge branch 'maint'
2009-02-18 Merge branch 'maint'
2009-02-12 Merge branch 'maint'
2009-02-11 Merge branch 'maint'
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'js/maint-1.6.0-path-normalize'
2009-02-11 Merge branch 'maint'
2009-02-09 Merge branch 'maint'
2009-02-07 Merge branch 'js/filter-branch-submodule'
2009-02-07 Merge branch 'maint'
2009-02-06 Merge branch 'js/maint-remote-remove-mirror'
2009-02-06 Merge branch 'js/notes'
2009-02-06 Merge branch 'gt/utf8-width'
2009-02-06 Merge branch 'jk/head-symref'
2009-02-06 Merge branch 'cb/mergetool'
2009-02-06 Merge branch 'maint'
2009-02-04 Merge branch 'maint'
2009-02-04 Merge branch 'maint'
2009-02-03 Merge branch 'maint'
2009-02-03 Merge branch 'jc/maint-add-u-remove-conflicted'
2009-02-03 Merge branch 'jk/maint-cleanup-after-exec-failure'
2009-02-01 Merge branch 'ks/maint-mailinfo-folded'
2009-02-01 Merge branch 'jc/maint-apply-fix'
2009-02-01 Merge branch 'am/maint-push-doc'
2009-02-01 Merge branch 'jc/maint-allow-uninteresting-missing'
2009-02-01 Merge branch 'js/maint-rebase-i-submodule'
2009-02-01 Merge branch 'jc/maint-split-diff-metainfo'
2009-02-01 Merge branch 'sp/runtime-prefix'
2009-02-01 Merge branch 'jk/signal-cleanup'
2009-02-01 Merge branch 'jg/mergetool'
2009-02-01 Merge branch 'maint'
2009-01-29 Sync with 1.6.1.2
2009-01-28 Merge branch 'tr/previous-branch'
2009-01-28 Merge branch 'maint'
2009-01-26 Merge branch 'kb/lstat-cache'
2009-01-26 Merge branch 'js/diff-color-words'
2009-01-26 Merge branch 'cb/add-pathspec'
2009-01-26 Merge branch 'js/maint-all-implies-HEAD'
2009-01-26 Merge branch 'sr/clone-empty'
2009-01-26 Sync with 1.6.1.1
2009-01-24 Merge branch 'js/patience-diff'
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-18 Merge branch 'tr/maint-no-index-fixes'
2009-01-14 Merge branch 'cb/maint-unpack-trees-absense'
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Implement the patience diff algorithm
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Merge branch 'ap/maint-apply-modefix'
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-03 Merge branch 'jk/maint-commit-v-strip' into maint
2008-12-03 xdiff: give up scanning similar lines early
2008-12-03 Merge branch 'maint'
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-12-01 Merge branch 'maint'
2008-11-29 Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-28 Merge branch 'js/mingw-rename-fix'
2008-11-28 Merge branch 'ph/send-email'
2008-11-28 Merge branch 'maint'
2008-11-27 Merge branch 'rw/maint-typofix' into rw/typofix
2008-11-26 Merge branch 'maint'
2008-11-26 Merge branch 'mm/maint-sort-config-doc' into mm/sort...
2008-11-24 Merge branch 'maint'
2008-11-17 Merge branch 'maint'
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-16 Merge branch 'maint'
2008-11-16 Merge branch 'bc/maint-keep-pack'
2008-11-16 Merge branch 'jk/commit-v-strip'
2008-11-15 Merge branch 'maint'
2008-11-14 Merge git://git.bogomips.org/git-svn
2008-11-14 Merge git://git.bogomips.org/git-svn
2008-11-14 Merge branch 'maint'
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
next