ll-merge: use a longer conflict marker for internal merge
[gitweb.git] / t / t4018 / cpp-void-c-function
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21 Merge branch 'iu/fix-parse-options-h-comment' into...
2015-03-23 Merge branch 'jc/decorate-leaky-separator-color' into...
2015-03-14 Merge branch 'jc/diff-test-updates' into maint
2015-03-14 Merge branch 'jc/apply-beyond-symlink' into maint
2015-03-05 Merge branch 'sb/plug-leak-in-make-cache-entry' into...
2015-03-05 Merge branch 'es/blame-commit-info-fix' into maint
2015-03-05 Merge branch 'ab/merge-file-prefix' into maint
2015-03-05 Merge branch 'ps/submodule-sanitize-path-upon-add'...
2015-03-05 Merge branch 'jk/pack-bitmap' into maint
2015-03-05 Merge branch 'jk/decimal-width-for-uintmax' into maint
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'jc/diff-format-doc' into maint
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25 Merge branch 'jk/status-read-branch-name-fix' into...
2015-01-12 Merge branch 'mh/find-uniq-abbrev' into maint
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-12 Merge branch 'jk/for-each-reflog-ent-reverse' into...
2015-01-07 Merge branch 'maint-1.9' into maint-2.0
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2015-01-07 Merge branch 'pd/completion-filenames-fix'
2015-01-07 Merge branch 'jc/diff-b-m'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-12-22 Merge branch 'js/test-hashmap-squelch-gcc'
2014-12-22 Merge branch 'po/doc-assume-unchanged'
2014-12-22 Merge branch 'jk/for-each-reflog-ent-reverse'
2014-12-22 Merge branch 'sv/doc-stripspace'
2014-12-22 Merge branch 'rj/t0050-passes'
2014-12-22 Merge branch 'mh/find-uniq-abbrev'
2014-12-22 Merge branch 'jc/refer-to-t-readme-from-submitting...
2014-12-22 Merge branch 'jk/checkout-from-tree' into maint
2014-12-17 Sync with v1.9.5
2014-12-12 Merge branch 'jk/pack-bitmap'
2014-12-12 Merge branch 'rt/push-recurse-submodule-usage-string'
2014-12-12 Merge branch 'sv/typofix-apply-error-message'
2014-12-12 Merge branch 'jc/unpack-trees-plug-leak'
2014-12-05 Merge branch 'jk/checkout-from-tree'
2014-11-19 Merge branch 'sv/submitting-final-patch'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-12 Merge branch 'nd/gitignore-trailing-whitespace' into...
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into maint
2014-11-10 Merge branch 'js/diff-highlight-avoid-sigpipe'
2014-11-10 Merge branch 'jc/conflict-hint' into cc/interpret-trail...
2014-11-06 Merge branch 'nd/gitignore-trailing-whitespace'
2014-11-06 Merge branch 'tm/line-log-first-parent'
2014-10-31 Merge branch 'rs/grep-color-words'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29 Merge branch 'rs/daemon-fixes' into maint
2014-10-29 Merge branch 'mg/lib-gpg-ro-safety'
2014-10-16 Merge branch 'jc/completion-no-chdir'
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-10-14 Merge branch 'rs/mailsplit'
2014-10-14 Merge branch 'rs/sha1-array-test'
2014-10-14 Merge branch 'rs/daemon-fixes'
2014-10-14 Merge branch 'so/rebase-doc-fork-point'
2014-10-08 Merge branch 'nd/archive-pathspec'
2014-10-07 Merge branch 'maint-1.9' into maint-2.0
2014-09-30 Merge branch 'jc/test-lazy-prereq'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-30 Merge branch 'jk/fsck-exit-code-fix' into maint
2014-09-30 Merge branch 'jk/index-pack-threading-races' into maint
2014-09-29 Merge branch 'sb/t6031-typofix'
2014-09-29 Merge branch 'sb/t9300-typofix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-09-19 Merge branch 'et/spell-poll-infinite-with-minus-one...
2014-09-19 Merge branch 'jn/unpack-trees-checkout-m-carry-deletion...
2014-09-19 Merge branch 'sp/pack-protocol-doc-on-shallow' into...
2014-09-19 Merge branch 'rs/refresh-beyond-symlink' into maint
2014-09-19 Merge branch 'lf/bundle-exclusion' into maint
2014-09-19 Merge branch 'jc/apply-ws-prefix' into maint
2014-09-19 Merge branch 'jk/command-line-config-empty-string'...
2014-09-19 Merge branch 'jk/fsck-exit-code-fix'
2014-09-19 Merge branch 'sp/doc-update-index-cacheinfo'
2014-09-19 Merge branch 'rs/export-strbuf-addchars'
2014-09-19 Merge branch 'jk/index-pack-threading-races'
2014-09-11 Merge branch 'jk/name-decoration-alloc'
2014-09-11 Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
2014-09-11 Merge branch 'rs/list-optim'
2014-09-11 Merge branch 'et/spell-poll-infinite-with-minus-one...
2014-09-09 Merge branch 'sp/pack-protocol-doc-on-shallow'
2014-09-09 Merge branch 'rs/inline-compat-path-macros'
2014-09-09 Merge branch 'rs/clean-menu-item-defn'
2014-09-09 Merge branch 'sb/mailsplit-dead-code-removal'
2014-09-09 Merge branch 'sb/blame-msg-i18n'
2014-09-09 Merge branch 'rs/refresh-beyond-symlink'
2014-09-09 Merge branch 'jk/stash-list-p'
2014-09-09 Merge branch 'mm/log-branch-desc-plug-leak'
2014-09-09 Merge branch 'lf/bundle-exclusion'
2014-09-09 Merge branch 'jc/apply-ws-prefix'
2014-09-09 Merge branch 'jk/command-line-config-empty-string'
2014-09-09 Merge branch 'bc/imap-send-doc'
2014-09-02 Merge branch 'ta/pretty-parse-config'
2014-09-02 Merge branch 'bc/archive-pax-header-mode'
2014-08-26 Merge branch 'jk/diff-tree-t-fix'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-08-04 Merge branch 'tf/maint-doc-push'
2014-07-23 Merge branch 'rs/fix-unlink-unix-socket'
2014-07-22 Merge branch 'ah/fix-http-push' into maint
2014-07-22 Merge branch 'zk/log-graph-showsig' into maint
next