commit: pay attention to submodule.$name.ignore in .gitmodules
[gitweb.git] / builtin / merge-recursive.c
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
2010-09-15 Merge branch 'os/fix-rebase-diff-no-prefix'
2010-09-15 Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
2010-09-15 Merge branch 'ch/maint-cannot-create-bundle-error'
2010-09-15 Merge branch 'ks/recursive-rename-add-identical'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-09-12 Merge branch 'maint'
2010-09-10 Merge branch 'maint'
2010-09-10 Merge branch 'maint'
2010-09-08 Merge branch 'tf/cleanup-builtin-help-headers'
2010-09-08 Merge branch 'jk/test-must-fail-missing'
2010-09-08 Merge branch 'jh/error-removing-missing-note'
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-07 Merge branch 'maint'
2010-09-06 Merge branch 'jh/clean-exclude'
2010-09-06 Merge branch 'jl/maint-fix-test'
2010-09-06 Merge branch 'maint' v1.7.3-rc0
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 'nd/clone-depth-zero'
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 'jc/maint-doc-em-dash'
2010-09-03 Merge branch 'mg/doc-bundle'
2010-09-03 Merge branch 'jn/doc-backslash'
2010-09-03 Merge branch 'jn/update-contrib-example-merge'
2010-09-03 Merge branch 'jn/merge-renormalize'
2010-09-03 Sync with 1.7.2.3
2010-09-03 builtin/merge_recursive.c: Add an usage string and...
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' 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 '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-06 merge-recursive --renormalize
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-16 Merge branch 'jc/diff-merge-base-multi'
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 'tc/commit-abbrev-fix' into maint
2010-06-22 Merge branch 'cc/maint-diff-CC-binary' 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 'cb/assume-unchanged-fix' 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-16 Merge branch 'cw/maint-exec-defpath' into maint
2010-06-16 Merge branch 'cb/maint-stash-orphaned-file' 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 'rc/maint-curl-helper' into maint
2010-06-16 Merge branch 'hg/maint-attr-fix' into maint
2010-06-13 Merge branch 'js/try-to-free-stackable'
2010-06-13 Merge branch 'cb/assume-unchanged-fix'
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 'cb/maint-stash-orphaned-file'
2010-05-21 Merge branch 'jn/maint-bundle'
2010-05-21 Merge branch 'rr/doc-submitting'
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jn/shortlog'
2010-05-21 Merge branch 'jn/t7006-fixup'
2010-05-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-05-21 Merge branch 'sp/maint-dumb-http-pack-reidx'
2010-05-21 Merge branch 'np/index-pack-memsave'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-05-21 Merge branch 'jc/maint-no-reflog-expire-unreach-for...
next