merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t3500-cherry.sh
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
2010-09-08 Merge branch 'en/d-f-conflict-fix'
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-01 Merge branch 'sg/rerere-gc-old-still-used' into maint
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into maint
2010-08-31 Merge branch 'en/d-f-conflict-fix'
2010-08-31 Merge branch 'en/fast-export-fix'
2010-08-31 Merge branch 'sg/rerere-gc-old-still-used'
2010-08-30 Merge branch 'maint-1.7.1' into maint
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-19 Merge branch 'jc/sha1-name-find-fix' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'cc/find-commit-subject'
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-13 Merge branch 'jc/sha1-name-find-fix'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-03 Merge branch 'sv/maint-diff-q-clear-fix' into maint
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-07-27 Sync with 1.7.1.2
2010-07-26 Merge branch 'maint-1.7.1' into maint
2010-07-20 Merge branch 'maint'
2010-07-19 Merge branch 'maint'
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'wp/merge-tree-fix'
2010-07-15 Merge branch 'js/merge-rr-fix'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jk/maint-status-keep-index-timestamp'
2010-07-15 Merge branch 'bc/maint-makefile-fixes'
2010-07-15 Merge branch 'maint'
2010-07-13 Merge branch 'maint'
2010-07-12 Merge branch 'maint'
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'maint'
2010-07-07 Merge branch 'maint'
2010-07-06 Merge branch 'maint'
2010-07-05 Merge branch 'maint'
2010-06-30 Merge branch 'mg/doc-rev-parse-treepath-syntax'
2010-06-30 Merge branch 'jl/status-ignore-submodules'
2010-06-30 Merge branch 'as/maint-completion-set-u-fix'
2010-06-30 Merge branch 'jl/maint-diff-ignore-submodules'
2010-06-29 Sync with 1.7.1.1
2010-06-29 Merge branch 'maint'
2010-06-27 Merge branch 'pb/maint-perl-errmsg-no-dir'
2010-06-27 Merge branch 'tr/send-email-8bit'
2010-06-27 Merge branch 'js/maint-am-rebase-invalid-author'
2010-06-25 Merge branch 'maint'
2010-06-22 Merge branch 'jc/maint-simpler-common-prefix'
2010-06-22 Merge branch 'bd/maint-unpack-trees-parawalk-fix'
2010-06-22 Merge branch 'jc/rev-list-ancestry-path'
2010-06-22 Merge branch 'maint'
2010-06-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-06-21 Merge branch 'cc/maint-commit-reflog-msg'
2010-06-21 Merge branch 'ic/maint-rebase-i-abort'
2010-06-21 Merge branch 'jk/maint-advice-empty-amend'
2010-06-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
2010-06-21 Merge branch 'jn/document-rebase-i-p-limitation'
2010-06-21 Merge branch 'tc/commit-abbrev-fix'
2010-06-21 Merge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21 Merge branch 'js/async-thread'
2010-06-21 Merge branch 'gv/portable'
2010-06-21 Merge branch 'jn/gitweb-fastcgi'
2010-06-21 Merge branch 'jn/checkout-doc'
2010-06-21 Merge branch 'maint'
2010-06-21 Merge branch 'maint'
2010-06-18 Merge branch 'cc/maint-diff-CC-binary'
2010-06-18 Merge branch 'cb/ls-files-cdup'
2010-06-18 Merge branch 'jc/t9129-any-utf8'
2010-06-18 Merge branch 'ab/maint-perl-use-instlibdir'
2010-06-18 Merge branch 'rc/ls-remote-default'
2010-06-18 Merge branch 'hg/id-munging'
2010-06-18 Merge branch 'tc/merge-m-log'
2010-06-18 Merge branch 'ph/clone-message-reword'
2010-06-17 Merge 'maint' updates in
2010-06-14 Merge branch 'maint'
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 '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'
next