conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
[gitweb.git] / contrib / hooks /
2010-08-13 Merge branch 'jc/sha1-name-find-fix'
2010-08-13 Merge branch 'jn/doc-pull'
2010-08-13 Merge branch 'jn/maint-gitweb-dynconf'
2010-08-13 Merge branch 'bc/use-more-hardlinks-in-install'
2010-08-13 Merge branch 'tr/rfc-reset-doc'
2010-08-13 Merge branch 'jn/parse-date-basic'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-11 Merge branch 'maint'
2010-08-11 post-receive-email: remove spurious commas in email...
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.0 series
2010-07-26 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-07-26 Merge branch 'maint-1.6.5' into maint-1.6.6
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-16 post-receive-email: optional message line count limit
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'maint-1.6.4' into maint
2010-07-07 Merge branch 'tr/receive-pack-aliased-update-fix' into...
2010-06-22 Merge branch 'jc/rev-list-ancestry-path'
2010-06-22 Merge branch 'tc/commit-abbrev-fix' into maint
2010-06-22 Merge branch 'cc/maint-diff-CC-binary' into maint
2010-06-22 Merge branch 'tc/merge-m-log' into maint
2010-06-22 Merge branch 'ph/clone-message-reword' into maint
2010-06-22 Merge branch 'jn/maint-amend-missing-name' into maint
2010-06-22 Merge branch 'pc/remove-warn' into maint
2010-06-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-06-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
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 'mc/maint-zoneparse' into maint
2010-06-21 Merge branch 'jk/diff-m-doc' into maint
2010-06-21 Merge branch 'bw/diff-metainfo-color' into maint
2010-06-21 Merge branch 'cb/assume-unchanged-fix' into maint
2010-06-21 Merge branch 'jn/notes-doc' into maint
2010-06-21 Merge branch 'ab/test-cleanup' into maint
2010-06-21 Merge branch 'rs/diff-no-minimal' into maint
2010-06-21 Merge branch 'bg/apply-blank-trailing-context' into...
2010-06-18 Merge branch 'cc/maint-diff-CC-binary'
2010-06-18 Merge branch 'ec/diff-noprefix-config'
2010-06-18 Merge branch 'jn/remote-set-branches'
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-16 Merge branch 'cw/maint-exec-defpath' into maint
2010-06-16 Merge branch 'sc/http-late-auth' into maint
2010-06-16 Merge branch 'by/blame-doc-m-c' into maint
2010-06-16 Merge branch 'cb/maint-stash-orphaned-file' into maint
2010-06-16 Merge branch 'mg/advice-statushints' into maint
2010-06-16 Merge branch 'jn/maint-bundle' into maint
2010-06-16 Merge branch 'rr/doc-submitting' into maint
2010-06-16 Merge branch 'jn/t7006-fixup' into maint
2010-06-16 Merge branch 'jn/shortlog' into maint
2010-06-16 Merge branch 'np/index-pack-memsave' into maint
2010-06-16 Merge branch 'sp/maint-dumb-http-pack-reidx' into maint
2010-06-16 Merge branch 'jc/am-3-show-corrupted-patch' into maint
2010-06-16 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-06-16 Merge branch 'np/malloc-threading' into maint
2010-06-16 Merge branch 'bg/send-email-smtpdomain' into maint
2010-06-16 Merge branch 'rc/maint-curl-helper' into maint
2010-06-16 Merge branch 'hg/maint-attr-fix' into maint
2010-06-16 Merge branch 'mh/status-optionally-refresh' into maint
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/fsck-ident'
2010-06-13 Merge branch 'rs/grep-binary'
2010-06-13 Merge branch 'jn/gitweb-syntax-highlight'
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-01 Merge branch 'maint-1.7.0' into maint
2010-05-28 Merge branch 'maint-1.7.0' into 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'
next