merge-recursive: Fix code checking for D/F conflicts still being present
[gitweb.git] / attr.c
2010-11-30 Merge branch 'jc/emfile'
2010-11-30 Merge branch 'jl/add-p-reverse-message'
2010-11-30 Merge branch 'np/pack-broken-boundary'
2010-11-30 Merge branch 'np/diff-in-corrupt-repository'
2010-11-30 Merge branch 'fc/apply-p2-get-header-name'
2010-11-30 Merge branch 'cm/diff-check-at-eol'
2010-11-30 Merge branch 'ak/apply-non-git-epoch'
2010-11-30 Merge branch 'tc/smart-http-post-redirect'
2010-11-26 Merge branch 'en/and-cascade-tests'
2010-11-24 Merge branch 'cb/maint-orphan-merge-noclobber'
2010-11-24 Merge branch 'jk/add-e-doc'
2010-11-24 Merge branch 'kb/maint-rebase-autosquash'
2010-11-24 Merge branch 'en/and-cascade-tests'
2010-11-24 Merge branch 'maint'
2010-11-24 Merge branch 'aw/git-p4-deletion' into maint
2010-11-17 Merge branch 'jl/maint-pull-tags-doc'
2010-11-17 Merge branch 'kb/maint-submodule-savearg'
2010-11-17 Merge branch 'kb/maint-diff-ws-check'
2010-11-17 Merge branch 'bg/maint-gitweb-test-lib'
2010-11-17 Merge branch 'jm/mailmap'
2010-11-17 Merge branch 'tr/maint-git-repack-tmpfile'
2010-11-17 Merge branch 'jk/maint-apply-no-binary'
2010-11-17 Merge branch 'tr/maint-merge-file-subdir'
2010-11-17 Merge branch 'jn/send-pack-error'
2010-11-17 Merge branch 'ak/submodule-sync'
2010-11-17 Merge branch 'jk/maint-rev-list-nul'
2010-11-17 Merge branch 'ks/no-textconv-symlink'
2010-11-17 Merge branch 'cb/diff-fname-optim'
2010-11-17 Merge branch 'jk/no-textconv-symlink'
2010-11-17 Merge branch 'dk/maint-blame-el'
2010-11-17 Merge branch 'maint'
2010-11-15 Merge branch 'maint'
2010-11-09 Merge branch 'maint'
2010-11-05 Merge branch 'aw/git-p4-deletion'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-11-05 Merge branch 'maint'
2010-10-27 Merge branch 'sb/send-email-use-to-from-input'
2010-10-27 Merge branch 'ab/require-perl-5.8'
2010-10-27 Merge branch 'kb/merge-recursive-rename-threshold'
2010-10-27 Merge branch 'jp/send-email-to-cmd'
2010-10-27 Merge branch 'as/daemon-multi-listen'
2010-10-27 Merge branch 'dm/mergetool-vimdiff'
2010-10-27 Merge branch 'kf/post-receive-sample-hook'
2010-10-27 Merge branch 'jf/merge-ignore-ws'
2010-10-27 Merge branch 'ml/completion-zsh'
2010-10-27 Merge branch 'po/sendemail'
2010-10-27 Merge branch 'en/tree-walk-optim'
2010-10-26 Merge branch 'maint'
2010-10-22 Sync with 1.7.3.2
2010-10-19 Merge branch 'maint'
2010-10-14 Merge branch 'maint'
2010-10-06 Merge branch 'maint'
2010-10-06 Merge branch 'jk/repack-reuse-object'
2010-10-06 Merge branch 'bc/fix-cherry-pick-root'
2010-10-06 Merge branch 'uk/fix-author-ident-sed-script'
2010-10-06 Merge branch 'cw/gitweb-hilite-config'
2010-10-06 Merge branch 'ab/makefile-track-cc'
2010-10-06 Merge branch 'mg/reset-doc'
2010-10-06 Merge branch 'maint'
2010-09-30 Merge branch 'maint'
2010-09-29 Merge branch 'tr/send-email-refuse-sending-unedited...
2010-09-29 Merge branch 'ab/send-email-catfile'
2010-09-29 Merge branch 'jc/grep-header-all-match-fix'
2010-09-29 Merge branch 'jc/no-branch-name-with-dash-at-front'
2010-09-29 Merge branch 'jn/gitweb-test-lib'
2010-09-29 Merge branch 'bc/fortran-userdiff'
2010-09-29 Merge branch 'jk/read-tree-empty'
2010-09-29 Merge branch 'rr/format-patch-count-without-merges'
2010-09-29 Merge branch 'jc/pickaxe-grep'
2010-09-29 Merge branch 'gb/shell-ext'
2010-09-29 Merge branch 'rr/fmt-merge-msg'
2010-09-29 Merge branch 'po/etc-gitattributes'
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge git://repo.or.cz/git-gui
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-09-01 Add global and system-wide gitattributes
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-27 Sync with 1.7.0 series
2010-07-26 Merge branch 'maint-1.7.1' into maint
2010-07-26 Merge branch 'maint-1.7.0' into maint-1.7.1
next