ll-merge: use a longer conflict marker for internal merge
[gitweb.git] / t / t9112-git-svn-md5less-file.sh
2013-10-08 Merge branch 'tz/credential-netrc'
2013-09-26 Merge branch 'mm/rebase-continue-freebsd-WB' into maint
2013-09-26 Merge branch 'km/svn-1.8-serf-only' into maint
2013-09-26 Merge branch 'js/xread-in-full' into maint
2013-09-26 Merge branch 'bc/send-email-ssl-die-message-fix' into...
2013-09-25 Merge branch 'jk/shortlog-tolerate-broken-commit'
2013-09-25 Merge branch 'nd/fetch-pack-error-reporting-fix'
2013-09-25 Merge branch 'jc/push-cas'
2013-09-20 Merge branch 'jk/upload-pack-keepalive'
2013-09-20 Merge branch 'mm/rebase-continue-freebsd-WB'
2013-09-20 Merge branch 'jh/checkout-auto-tracking'
2013-09-20 Merge branch 'bc/http-backend-allow-405'
2013-09-20 Merge branch 'hu/cherry-pick-previous-branch'
2013-09-18 Merge branch 'jl/some-submodule-config-are-not-boolean...
2013-09-18 Merge branch 'tr/log-full-diff-keep-true-parents' into...
2013-09-18 Merge branch 'jk/mailmap-incomplete-line' into maint
2013-09-18 Merge branch 'jc/url-match'
2013-09-18 Merge branch 'jc/cvsserver-perm-bit-fix'
2013-09-18 Merge branch 'bc/send-email-ssl-die-message-fix'
2013-09-18 Merge branch 'uh/git-svn-serf-fix'
2013-09-18 Merge branch 'jk/duplicate-objects-in-packs'
2013-09-18 Merge branch 'nd/git-dir-pointing-at-gitfile'
2013-09-17 Merge branch 'dw/diff-no-index-doc'
2013-09-17 Merge branch 'ab/gitweb-author-initials'
2013-09-17 Merge branch 'jk/write-broken-index-with-nul-sha1'
2013-09-17 Merge branch 'jx/clean-interactive'
2013-09-17 Merge branch 'jk/free-tree-buffer'
2013-09-12 Merge branch 'jc/pager-configuration-doc'
2013-09-12 Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-12 Merge branch 'mm/fast-import-feature-doc'
2013-09-11 Merge branch 'jc/ls-files-killed-optim'
2013-09-11 Merge branch 'tf/gitweb-ss-tweak'
2013-09-11 Merge branch 'js/xread-in-full'
2013-09-11 Merge branch 'es/rebase-i-respect-core-commentchar'
2013-09-09 Merge branch 'nd/magic-pathspec'
2013-09-09 Merge branch 'jk/mailmap-incomplete-line'
2013-09-09 Merge branch 'jc/url-match'
2013-09-09 Merge branch 'jl/submodule-mv'
2013-09-09 Merge branch 'tr/log-full-diff-keep-true-parents'
2013-09-09 Merge branch 'jk/cat-file-batch-optim'
2013-09-09 Merge branch 'db/http-savecookies'
2013-09-09 Merge branch 'jc/push-cas'
2013-09-09 Merge branch 'nd/clone-connectivity-shortcut'
2013-09-09 Merge branch 'jc/diff-filter-negation'
2013-09-09 Merge branch 'ms/fetch-prune-configuration'
2013-09-05 Merge branch 'nd/fetch-pack-shallow-fix' into maint
2013-09-05 Merge branch 'hv/config-from-blob' into maint
2013-09-05 Merge branch 'maint-1.8.3' into maint
2013-09-04 Merge branch 'sb/parseopt-boolean-removal'
2013-09-04 Merge branch 'jc/parseopt-command-modes'
2013-09-04 Merge branch 'jl/some-submodule-config-are-not-boolean'
2013-09-04 Merge branch 'sb/diff-delta-remove-needless-comparison'
2013-09-04 Merge branch 'nd/gc-lock-against-each-other'
2013-09-04 Merge branch 'tr/fd-gotcha-fixes'
2013-09-04 Merge branch 'bc/unuse-packfile'
2013-09-04 Merge branch 'da/darwin'
2013-09-04 Merge branch 'nd/sq-quote-buf'
2013-09-04 Merge branch 'rr/feed-real-path-to-editor'
2013-09-04 Merge branch 'jk/fast-import-empty-ls'
2013-09-04 Merge branch 'km/svn-1.8-serf-only'
2013-09-04 Merge branch 'jc/check-x-z'
2013-09-03 Merge branch 'maint-1.8.3' into maint
2013-08-30 Merge branch 'rt/doc-merge-file-diff3'
2013-08-30 Merge branch 'mb/docs-favor-en-us'
2013-08-30 Merge branch 'rj/doc-rev-parse'
2013-08-30 Merge branch 'hv/config-from-blob'
2013-08-30 Merge branch 'nd/fetch-pack-shallow-fix'
2013-08-13 Merge branch 'sb/mailmap-updates'
2013-08-09 Merge branch 'maint'
2013-08-09 Merge branch 'jk/submodule-subdirectory-ok'
2013-08-09 Merge branch 'sb/mailmap-updates'
2013-08-05 Sync with maint to grab trivial doc fixes
2013-08-05 Merge branch 'es/blame-L-breakage'
2013-08-05 Merge git://github.com/git-l10n/git-po
2013-08-05 Merge branch 'sb/mailmap-updates'
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-08-05 Merge branch 'bc/commit-invalid-utf8'
2013-08-02 Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'
2013-08-02 Merge branch 'jk/cat-file-batch-optim'
2013-08-01 Merge branch 'ob/typofixes'
2013-07-29 many small typofixes
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
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-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-07-22 Merge branch 'ms/daemon-doc-typo'
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...
next