submodule add: Fail when .git/modules/<name> already exists unless forced
[gitweb.git] / t / t6037-merge-ours-theirs.sh
2012-09-25 Merge branch 'rr/test-make-sure-we-have-git'
2012-09-25 Merge branch 'ep/malloc-check-perturb'
2012-09-25 Merge branch 'aj/xfuncname-ada'
2012-09-25 Merge branch 'jc/maint-mailinfo-mime-attr'
2012-09-25 Merge branch 'po/maint-docs'
2012-09-25 Merge branch 'db/doc-custom-xmlto'
2012-09-25 Merge branch 'maint'
2012-09-24 Sync with maint
2012-09-21 Merge branch 'mh/fetch-filter-refs'
2012-09-21 Merge branch 'jc/maint-log-grep-all-match-1'
2012-09-20 Merge branch 'maint'
2012-09-18 Merge branch 'jc/maint-log-grep-all-match'
2012-09-18 Merge branch 'pw/p4-submit-conflicts'
2012-09-18 Merge branch 'mv/cherry-pick-s'
2012-09-18 Merge branch 'nd/fetch-status-alignment'
2012-09-18 Sync with 1.7.12.1
2012-09-17 Merge branch 'maint'
2012-09-17 Merge branch 'mh/fetch-filter-refs'
2012-09-17 Merge branch 'nd/maint-diffstat-summary'
2012-09-17 Merge branch 'jk/config-warn-on-inaccessible-paths'
2012-09-17 Merge branch 'jw/doc-commit-title'
2012-09-17 Merge branch 'mh/string-list'
2012-09-17 Merge branch 'jc/maint-blame-no-such-path'
2012-09-15 Merge branch 'jc/ll-merge-binary-ours'
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-09-09 attr: "binary" attribute should choose built-in "binary...
2012-09-09 merge: teach -Xours/-Xtheirs to binary ll-merge driver
2012-08-24 Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-06 Merge branch 'jn/block-sha1' into maint
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-07-24 Merge branch 'jn/block-sha1'
2012-07-22 Merge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22 Merge branch 'tg/maint-cache-name-compare' into maint
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-07-16 Merge branch 'tg/maint-cache-name-compare'
2012-07-16 Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-11 Merge branch 'tg/maint-cache-name-compare' into tg...
2012-06-25 Merge branch 'lp/no-cmd-http-fetch'
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02 Merge branch 'pt/gitk'
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-22 Merge branch 'jk/maint-strbuf-missing-init'
2011-12-21 Merge branch 'jl/submodule-status-failure-report' into...
2011-12-21 Merge branch 'ms/commit-cc-option-helpstring' into...
2011-12-18 Update jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17 Merge git://ozlabs.org/~paulus/gitk
2011-12-14 Merge branch 'jl/submodule-status-failure-report'
2011-12-14 Merge branch 'jc/maint-name-rev-all' into maint-1.7.6
2011-12-14 Merge branch 'ml/mailmap' into maint-1.7.6
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui
2011-11-23 Merge branch 'maint' into tj/imap-send-remove-unused
2011-11-21 Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18 Merge branch 'jc/maint-name-rev-all' into maint
2011-11-18 Merge branch 'ml/mailmap' into maint
2011-11-12 Merge branch 'ly/mktree-using-strbuf'
2011-11-10 Merge "Move 'builtin-*' into a 'builtin/' subdirectory"
2011-11-09 Merge branch 'jc/remote-setbranches-usage-fix'
2011-11-09 Merge branch 'fc/remote-seturl-usage-fix'
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint
2011-11-08 Merge branch 'ss/blame-textconv-fake-working-tree'
2011-11-01 Merge branch 'md/smtp-tls-hello-again' into maint
2011-11-01 Merge branch 'ss/blame-textconv-fake-working-tree'
2011-10-26 Merge branch 'sn/doc-update-index-assume-unchanged...
2011-10-21 Merge branch 'jc/maint-remove-renamed-ref'
2011-10-21 Merge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-21 Merge branch 'js/maint-merge-one-file-osx-expr' into...
2011-10-19 Merge branch 'js/log-show-children'
2011-10-19 Merge branch 'cb/httpd-test-fix-port'
2011-10-19 Merge branch 'md/smtp-tls-hello-again'
2011-10-16 Merge git://repo.or.cz/git-gui
2011-10-16 Merge branch 'bk/ancestry-path' into maint
2011-10-16 Merge branch 'nm/grep-object-sha1-lock' into maint
2011-10-16 Merge branch 'jc/maint-grep-untracked-exclude' into...
2011-10-14 Merge branch 'js/maint-merge-one-file-osx-expr'
2011-10-14 Merge branch 'jc/apply-blank-at-eof-fix'
2011-10-14 Merge branch 'bw/grep-no-index-no-exclude'
2011-10-05 Merge branch 'sn/doc-update-index-assume-unchanged'
2011-10-05 Merge branch 'rj/quietly-create-dep-dir'
2011-10-05 Merge branch 'jc/fetch-pack-fsck-objects'
2011-10-05 Merge branch 'gb/am-hg-patch'
2011-10-05 Merge branch 'bk/ancestry-path'
2011-10-05 Merge branch 'nm/grep-object-sha1-lock'
2011-10-05 Merge branch 'jc/maint-grep-untracked-exclude' into...
2011-09-23 Merge branch 'gb/maint-am-patch-format-error-message...
2011-09-22 Merge branch 'bk/ancestry-path' into jc/branch-desc
2011-09-12 Merge branch 'jk/tag-contains-ab' (early part) into...
2011-09-12 Merge branch 'jk/maint-1.7.2-status-ignored' into maint
2011-09-02 Merge branch 'tr/maint-t3903-misquoted-command'
2011-09-02 Merge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02 Merge branch 'gb/maint-am-patch-format-error-message'
next