merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t6120-describe.sh
2010-06-13 Merge branch 'ab/cvsserver'
2010-06-13 Merge branch 'mg/notes-dry-run'
2010-06-13 Merge branch 'mc/maint-zoneparse'
2010-06-13 Merge branch 'jk/diff-m-doc'
2010-06-13 Merge branch 'jn/maint-doc-ignore'
2010-06-13 Merge branch 'jn/fsck-ident'
2010-06-13 Merge branch 'bs/userdiff-php'
2010-06-13 Merge branch 'jk/maint-sha1-file-name-fix'
2010-06-13 Merge branch 'jk/maint-pull-dry-run-noop'
2010-06-13 Merge branch 'rs/grep-binary'
2010-06-13 Merge branch 'jn/gitweb-syntax-highlight'
2010-06-13 Merge branch 'js/maint-windows'
2010-06-13 Merge branch 'bw/diff-metainfo-color'
2010-06-13 Merge branch 'js/try-to-free-stackable'
2010-06-13 Merge branch 'jn/make-header-dependency'
2010-06-13 Merge branch 'cb/assume-unchanged-fix'
2010-06-13 Merge branch 'jn/notes-doc'
2010-06-13 Merge branch 'wp/pretty-enhancement'
2010-06-13 Merge branch 'ab/test-cleanup'
2010-06-13 Merge branch 'jn/maint-amend-missing-name'
2010-06-13 Merge branch 'rs/diff-no-minimal'
2010-06-13 Merge branch 'maint'
2010-06-12 Merge branch 'maint'
2010-06-08 Merge branch 'maint'
2010-06-07 Merge branch 'maint'
2010-06-07 Merge branch 'maint'
2010-06-02 Merge branch 'maint'
2010-06-01 Merge branch 'maint'
2010-05-28 Merge branch 'maint'
2010-05-25 Merge branch 'maint'
2010-05-21 Merge branch 'by/blame-doc-m-c'
2010-05-21 Merge branch 'by/log-follow'
2010-05-21 Merge branch 'mg/advice-statushints'
2010-05-21 Merge branch 'cb/maint-stash-orphaned-file'
2010-05-21 Merge branch 'jn/maint-bundle'
2010-05-21 Merge branch 'pb/patch-id-plus'
2010-05-21 Merge branch 'rr/doc-submitting'
2010-05-21 Merge branch 'st/remote-tags-no-tags'
2010-05-21 Merge branch 'jn/fsck-ident'
2010-05-21 Merge branch 'jn/gitweb-caching-prep'
2010-05-21 Merge branch 'jn/gitweb-install'
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jn/request-pull'
2010-05-21 Merge branch 'jn/shortlog'
2010-05-21 Merge branch 'jn/t7006-fixup'
2010-05-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-05-21 Merge branch 'sp/maint-dumb-http-pack-reidx'
2010-05-21 Merge branch 'jn/submodule-basic-test'
2010-05-21 Merge branch 'np/index-pack-memsave'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-05-21 Merge branch 'jc/maint-no-reflog-expire-unreach-for...
2010-05-21 Merge branch 'cw/maint-exec-defpath'
2010-05-21 Merge branch 'tr/word-diff'
2010-05-21 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-13 describe: Break annotated tag ties by tagger date
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'mg/maint-send-email-lazy-editor' into...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-29 Merge branch 'cp/add-u-pathspec' into maint
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-10 Merge branch 'cp/add-u-pathspec'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-08 Merge branch 'jk/maint-add--interactive-delete' into...
2010-03-07 Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'cc/maint-bisect-paths' into maint-1.6.6
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-07 Merge branch 'jk/maint-add--interactive-delete'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-05 Merge branch 'cc/maint-bisect-paths' into maint
2010-03-05 Merge branch 'maint-1.6.5' into maint-1.6.6
2010-03-03 Merge branch 'jc/maint-fix-test-perm' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-03-01 Merge branch 'cc/maint-bisect-paths'
2010-02-21 Merge branch 'jc/maint-fix-test-perm'
2010-02-19 Merge branch 'jk/maint-rmdir-fix' into maint
2010-02-16 Merge branch 'maint-1.6.5' into maint-1.6.6
2010-02-10 Merge branch 'maint-1.6.5' into maint
2010-02-10 Merge branch 'gp/maint-cvsserver' into maint
2010-02-10 Merge branch 'jc/maint-reflog-bad-timestamp' into maint
2010-02-10 Merge branch 'il/maint-xmallocz' into maint
2010-02-10 Merge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-09 Merge branch 'maint-1.6.5' into maint
2010-02-09 Merge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
next