merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t0025-crlf-auto.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 'jn/grep-open'
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 'ar/decorate-color'
2010-06-30 Merge branch 'mg/doc-rev-parse-treepath-syntax'
2010-06-30 Merge branch 'cc/cherry-pick-stdin'
2010-06-30 Merge branch 'jl/status-ignore-submodules'
2010-06-30 Merge branch 'jk/url-decode'
2010-06-30 Merge branch 'jn/grep-open'
2010-06-30 Merge branch 'jp/string-list-api-cleanup'
2010-06-30 Merge branch 'tr/rev-list-count'
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 'cp/textconv-cat-file'
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-27 Merge branch 'ab/blame-textconv'
2010-06-27 Merge branch 'jn/show-num-walks'
2010-06-25 Merge branch 'maint'
2010-06-23 Merge branch 'jk/url-decode'
2010-06-22 Merge branch 'jc/maint-simpler-common-prefix'
2010-06-22 Merge branch 'sb/format-patch-signature'
2010-06-22 Merge branch 'mg/pretty-magic-space'
2010-06-22 Merge branch 'jn/gitweb-return-or-exit-cleanup'
2010-06-22 Merge branch 'bd/maint-unpack-trees-parawalk-fix'
2010-06-22 Merge branch 'cc/cherry-pick-series'
2010-06-22 Merge branch 'jc/rev-list-ancestry-path'
2010-06-22 Merge branch 'lt/extended-sha1-match-commit-with-regexp'
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-05-20 Rename the "crlf" attribute "text"
2010-05-20 Add per-repository eol normalization
2010-05-20 Add tests for per-repository eol normalization