merge-recursive: don't segfault while handling rename clashes
[gitweb.git] / builtin-fast-export.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 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-13 Merge branch 'cc/maint-1.6.0-bisect-fix' into maint...
2009-03-13 Merge branch 'fg/maint-1.6.0-exclude-bq' into maint...
2009-03-13 Merge branch 'js/maint-1.6.1-filter-branch-submodule...
2009-03-13 Merge branch 'gt/maint-1.6.1-utf8-width' into maint...
2009-03-13 Merge branch 'js/maint-1.6.1-remote-remove-mirror'...
2009-03-13 Merge branch 'ek/maint-1.6.1-filter-branch-bare' into...
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-03-13 Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
2009-02-28 Merge branch 'maint-1.6.0' into maint
2009-02-12 Merge branch 'maint-1.6.0' into maint
2009-02-12 fast-export: ensure we traverse commits in topological...
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 'sg/maint-gitdir-in-subdir' into maint
2009-02-06 Merge branch 'lt/maint-wrap-zlib' 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-29 Merge branch 'nd/grep-assume-unchanged' into maint
2009-01-29 Merge branch 'jc/maint-ls-tree' into maint
2009-01-29 Merge branch 'np/no-loosen-prune-expire-now' into maint
2009-01-29 Merge branch 'mc/cd-p-pwd' into maint
2009-01-29 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'jc/maint-1.6.0-split-diff-metainfo' 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-24 Merge branch 'rs/maint-shortlog-foldline' into maint
2009-01-24 Merge branch 'pb/maint-git-pm-false-dir' into maint
2009-01-24 Merge branch 'js/maint-bisect-gitk' into maint
2009-01-24 Merge branch 'js/add-not-submodule' into maint
2009-01-24 Merge branch 'jc/maint-format-patch' into maint
2009-01-24 Merge branch 'maint-1.6.0' into maint
2009-01-18 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-14 Merge branch 'maint-1.6.0' into maint
2009-01-13 Merge branch 'kk/maint-http-push' into maint
2009-01-13 Merge branch 'js/maint-merge-recursive-r-d-conflict...
2009-01-13 Merge branch 'cb/maint-merge-recursive-fix' into maint
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-13 Merge branch 'maint-1.6.0' into maint
2009-01-12 Merge branch 'mh/maint-sendmail-cc-doc' into maint
2009-01-12 Merge branch 'jc/maint-do-not-switch-to-non-commit...
2009-01-07 Merge branch 'maint-1.6.0' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 fast-export: print usage when no options specified
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 Merge branch 'maint' to sync with GIT 1.6.0.6
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-20 fast-export: deal with tag objects that do not have...
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-03 Merge branch 'jk/maint-commit-v-strip' into maint
2008-12-03 Merge branch 'bc/maint-keep-pack' into maint
2008-12-03 Merge branch 'js/mingw-rename-fix' into maint
2008-12-02 Merge git://repo.or.cz/git-gui
next