merge-recursive: Fix modify/delete resolution in the recursive case
[gitweb.git] / archive.c
2010-11-24 Merge branch 'uk/fix-author-ident-sed-script' into...
2010-11-24 Merge branch 'ab/makefile-track-cc' into maint
2010-11-24 Merge branch 'mg/reset-doc' into maint
2010-11-24 Merge branch 'tr/send-email-refuse-sending-unedited...
2010-11-17 Merge branch 'jk/missing-config'
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 'jk/push-progress'
2010-11-17 Merge branch 'tr/maint-merge-file-subdir'
2010-11-17 Merge branch 'jn/send-pack-error'
2010-11-17 Merge branch 'kb/completion-checkout'
2010-11-17 Merge branch 'sg/completion'
2010-11-17 Merge branch 'sg/bisect'
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 'jn/gitweb-test'
2010-11-17 Merge branch 'cb/diff-fname-optim'
2010-11-17 Merge branch 'jk/no-textconv-symlink'
2010-11-15 archive: improve --verbose description
2010-11-15 add description parameter to OPT__VERBOSE
2010-11-05 Merge branch 'aw/git-p4-deletion'
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-10-27 Merge branch 'ab/send-email-perl'
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-22 Sync with 1.7.3.2
2010-10-21 Merge branch 'sn/doc-opt-notation' into maint
2010-10-08 Use angles for placeholders consistently
2010-09-29 Merge branch 'rr/format-patch-count-without-merges'
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 branch 'ch/maint-cannot-create-bundle-error'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-08 Merge branch 'kf/askpass-config'
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
2010-09-08 Merge branch 'jk/maint-pass-c-config-in-env'
2010-09-08 Merge branch 'en/d-f-conflict-fix'
2010-09-06 Merge branch 'jh/clean-exclude'
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'jl/submodule-ignore-diff'
2010-09-04 Merge branch 'ab/test-2'
2010-09-04 Merge branch 'js/detached-stash'
2010-09-04 Merge branch 'js/maint-reflog-beyond-horizon'
2010-09-04 Merge branch 'dg/local-mod-error-messages'
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-03 Merge branch 'ab/compat-regex'
2010-09-03 Merge branch 'jn/maint-doc-user-manual-html-doctype'
2010-09-03 Merge branch 'cb/maint-mergetool-no-tty'
2010-09-03 Merge branch 'jn/apply-filename-with-sp'
2010-09-03 Merge branch 'jn/merge-custom-no-trivial'
2010-09-03 Merge branch 'jn/update-contrib-example-merge'
2010-09-03 Merge branch 'jn/merge-renormalize'
2010-09-01 Merge branch 'gp/pack-refs-remove-empty-dirs' into...
2010-09-01 Merge branch 'sg/rerere-gc-old-still-used' into maint
2010-09-01 Merge branch 'dj/fetch-tagopt' into maint
2010-09-01 Merge branch 'da/fix-submodule-sync-superproject-config...
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into maint
2010-08-31 Merge branch 'da/fix-submodule-sync-superproject-config'
2010-08-31 Merge branch 'jn/cherry-revert-message-clean-up'
2010-08-31 Merge branch 'cb/binary-patch-id'
2010-08-31 Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
2010-08-31 Merge branch 'dj/fetch-tagopt'
2010-08-31 Merge branch 'en/d-f-conflict-fix'
2010-08-31 Merge branch 'jn/svn-fe'
2010-08-31 Merge branch 'tr/maint-no-unquote-plus'
2010-08-31 Merge branch 'jn/paginate-fix'
2010-08-31 Merge branch 'jn/maint-setup-fix'
2010-08-31 Merge branch 'en/fast-export-fix'
2010-08-31 Merge branch 'hv/autosquash-config'
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 'mm/rebase-i-exec'
2010-08-22 Merge branch 'gb/split-cmdline-errmsg'
2010-08-22 Merge branch 'so/http-user-agent'
2010-08-22 Merge branch 'mm/shortopt-detached'
2010-08-22 Merge branch 'sr/local-config'
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'hv/submodule-find-ff-merge'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-22 Merge branch 'dg/local-mod-error-messages'
2010-08-22 Merge branch 'po/userdiff-csharp'
2010-08-22 Merge branch 'ab/perl-install'
2010-08-20 Merge branch 'jc/maint-follow-rename-fix' into maint
2010-08-20 Merge branch 'jn/maint-plug-leak' into maint
2010-08-20 Merge branch 'jn/fix-abbrev' into maint
next