Merge branch 'maint'
[gitweb.git] / t / t6037-merge-ours-theirs.sh
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-12 Merge branch 'as/api-allocation-doc' into maint
2013-01-12 Merge branch 'os/gitweb-highlight-uncaptured' into...
2013-01-12 Merge branch 'jn/warn-on-inaccessible-loosen' into...
2013-01-10 Merge branch 'ta/remove-stale-translated-tut' into...
2013-01-10 Merge branch 'tb/test-t9020-no-which' into maint
2013-01-10 Merge branch 'sp/shortlog-missing-lf' into maint
2013-01-10 Merge branch 'as/api-allocation-doc'
2013-01-10 Merge branch 'rs/leave-base-name-in-name-field-of-tar'
2013-01-10 Merge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-10 Merge branch 'as/dir-c-cleanup'
2013-01-10 Merge branch 'nd/wildmatch'
2013-01-10 Merge branch 'aw/rebase-am-failure-detection'
2013-01-10 Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
2013-01-09 Merge branch 'os/gitweb-highlight-uncaptured'
2013-01-08 Merge branch 'ta/remove-stale-translated-tut'
2013-01-08 Merge branch 'tb/test-t9020-no-which'
2013-01-08 Merge branch 'jk/maint-fast-import-doc-dedup-done'
2013-01-07 Merge branch 'jn/warn-on-inaccessible-loosen'
2013-01-07 Merge branch 'jc/apply-trailing-blank-removal'
2013-01-02 Merge branch 'sp/shortlog-missing-lf'
2013-01-02 Merge branch 'mk/maint-graph-infinity-loop'
2012-12-23 Merge branch 'nd/index-format-doc' into maint
2012-12-21 Merge branch 'nd/index-format-doc'
2012-12-11 Merge branch 'ef/mingw-rmdir'
2012-11-29 Merge branch 'jl/submodule-rm'
2012-11-26 Merge branch 'cn/config-missing-path' into maint
2012-11-21 Merge branch 'jk/maint-http-half-auth-fetch'
2012-11-20 Merge branch 'cn/config-missing-path'
2012-11-20 Merge branch 'jl/submodule-rm'
2012-11-20 Merge branch 'jk/maint-http-half-auth-fetch'
2012-11-20 Merge branch 'as/maint-doc-fix-no-post-rewrite' into...
2012-11-20 Merge branch 'rs/lock-correct-ref-during-delete' into...
2012-11-20 Merge branch 'js/format-2047' into maint
2012-11-19 Merge branch 'nd/grep-true-path' into maint
2012-11-19 Merge branch 'da/mergetools-p4' into maint
2012-11-19 Merge branch 'jc/test-say-color-avoid-echo-escape'...
2012-11-19 Merge branch 'bw/config-lift-variable-name-length-limit...
2012-11-15 Merge branch 'as/maint-doc-fix-no-post-rewrite'
2012-11-15 Merge branch 'jc/maint-fetch-tighten-refname-check'
2012-11-09 Merge branch 'nd/tree-walk-enum-cleanup'
2012-11-09 Merge branch 'js/format-2047'
2012-11-09 Merge branch 'rs/lock-correct-ref-during-delete'
2012-11-09 Merge branch 'nd/attr-match-optim-more'
2012-10-29 Merge branch 'nd/grep-true-path'
2012-10-29 Merge branch 'jk/maint-http-init-not-in-result-handler'
2012-10-29 Merge branch 'jl/submodule-rm'
2012-10-25 Merge branch 'jk/strbuf-detach-always-non-null'
2012-10-25 Merge branch 'js/mingw-fflush-errno'
2012-10-25 Merge branch 'da/mergetools-p4'
2012-10-25 Merge branch 'jc/test-say-color-avoid-echo-escape'
2012-10-25 Merge branch 'nd/attr-match-optim'
2012-10-25 Merge branch 'jk/peel-ref'
2012-10-25 Merge branch 'bw/config-lift-variable-name-length-limit'
2012-10-25 Merge branch 'fa/remote-svn'
2012-10-25 Merge branch 'jk/no-more-pre-exec-callback'
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17 Merge branch 'jk/maint-http-half-auth-push' into maint
2012-10-17 Merge branch 'rr/git-uri-doc' into maint
2012-10-17 Merge branch 'bw/cp-a-is-gnuism' into maint
2012-10-17 Merge branch 'nd/doc-ignore' into maint
2012-10-17 Merge branch 'jc/doc-long-options' into maint
2012-10-17 Merge branch 'jc/maint-t1450-fsck-order-fix' into maint
2012-10-17 Merge branch 'rr/test-use-shell-path-not-shell' into...
2012-10-17 Merge branch 'rr/test-make-sure-we-have-git' into maint
2012-10-17 Merge branch 'po/maint-docs' into maint
2012-10-17 Merge branch 'jc/ll-merge-binary-ours' into maint
2012-10-16 Merge branch 'jk/maint-http-half-auth-push'
2012-10-14 Merge branch 'maint'
2012-10-12 Merge branch 'maint'
2012-10-10 Merge branch 'rr/git-uri-doc'
2012-10-10 Merge branch 'bw/cp-a-is-gnuism'
2012-10-10 Merge branch 'nd/doc-ignore'
2012-10-10 Merge branch 'jc/doc-long-options'
2012-10-10 Sync with maint
2012-10-09 Merge branch 'maint'
2012-10-08 Merge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08 Merge branch 'jc/merge-bases-paint-fix'
2012-10-08 Sync with 1.7.12.3
2012-10-03 Merge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-02 Merge branch 'maint'
2012-10-01 Merge branch 'jk/completion-tests'
2012-10-01 Merge branch 'ep/malloc-check-perturb'
2012-10-01 Merge branch 'da/mergetool-custom'
2012-10-01 Merge branch 'os/commit-submodule-ignore'
2012-10-01 Merge branch 'jc/blame-follows-renames'
2012-10-01 Merge branch 'jk/receive-pack-unpack-error-to-pusher'
2012-10-01 Merge branch 'rt/maint-clone-single'
2012-09-30 Merge git://github.com/git-l10n/git-po
2012-09-30 Sync with 1.7.12.2
2012-09-30 Merge branch 'rr/maint-submodule-unknown-cmd'
2012-09-30 Merge branch 'rs/archive-zip-utf8'
2012-09-30 Merge branch 'jk/smart-http-switch'
2012-09-30 Merge branch 'sp/maint-http-enable-gzip'
2012-09-30 Merge branch 'sp/maint-http-info-refs-no-retry'
2012-09-30 Merge branch 'js/rebase-exec-command-not-found'
2012-09-30 Merge branch 'rr/test-use-shell-path-not-shell'
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'
next