Merge branch 'jn/parse-config-slot' into jk/colors
[gitweb.git] / t / t6023-merge-file.sh
2014-11-12 Merge branch 'nd/gitignore-trailing-whitespace' into...
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into maint
2014-10-29 Merge branch 'jk/pack-objects-no-bitmap-when-splitting...
2014-10-29 Merge branch 'rm/gitweb-start-form' into maint
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29 Merge branch 'rs/daemon-fixes' into maint
2014-10-07 Merge branch 'maint-2.0' into maint
2014-09-30 Merge branch 'jk/fsck-exit-code-fix' into maint
2014-09-30 Merge branch 'ta/config-add-to-empty-or-true-fix' into...
2014-09-30 Merge branch 'jk/index-pack-threading-races' into maint
2014-09-30 Merge branch 'so/rebase-doc' into maint
2014-09-19 Merge branch 'et/spell-poll-infinite-with-minus-one...
2014-09-19 Merge branch 'jk/prune-top-level-refs-after-packing...
2014-09-19 Merge branch 'jk/fast-import-fixes' into maint
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 'jk/prompt-stash-could-be-packed' 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-08-26 Merge branch 'jk/diff-tree-t-fix'
2014-08-26 Merge branch 'jk/pack-shallow-always-without-bitmap'
2014-08-26 Merge branch 'jk/fix-profile-feedback-build'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-08-04 Merge branch 'tf/maint-doc-push'
2014-08-04 Merge branch 'ta/doc-config'
2014-08-04 Merge remote-tracking branch 'sv/nafmo/master'
2014-07-30 Sync with 2.0.4
2014-07-30 Merge branch 'jk/more-push-completion'
2014-07-30 Merge branch 'sk/mingw-uni-fix-more'
2014-07-30 Merge branch 'ep/avoid-test-a-o'
2014-07-28 Merge branch 'maint'
2014-07-28 Merge branch 'jk/misc-fixes-maint'
2014-07-27 Merge branch 'jk/rebase-am-fork-point'
2014-07-27 Merge branch 'cc/replace-graft'
2014-07-27 Merge branch 'jk/stable-prio-queue'
2014-07-23 Sync with v2.0.3
2014-07-23 Merge branch 'rs/fix-unlink-unix-socket'
2014-07-23 Merge branch 'ta/string-list-init'
2014-07-23 Merge branch 'jk/tag-sort'
2014-07-22 Sync with maint
2014-07-22 Merge branch 'rs/code-cleaning'
2014-07-22 Merge branch 'nd/path-max-must-go'
2014-07-22 Merge branch 'jk/alloc-commit-id'
2014-07-22 Merge branch 'kb/perf-trace'
2014-07-21 Merge branch 'maint'
2014-07-21 Merge branch 'rs/unify-is-branch'
2014-07-21 Merge branch 'kb/avoid-fchmod-for-now'
2014-07-21 Merge branch 'sk/mingw-uni-fix'
2014-07-21 Merge branch 'ek/alt-odb-entry-fix'
2014-07-21 Merge branch 'kb/hashmap-updates'
2014-07-21 Merge branch 'jk/remote-curl-squelch-extra-errors'
2014-07-21 Merge branch 'rs/ref-transaction-0'
2014-07-21 Merge branch 'jl/submodule-tests'
2014-07-21 Merge branch 'ak/profile-feedback-build'
2014-07-21 Merge branch 'cc/for-each-mergetag'
2014-07-16 Sync with 2.0.2
2014-07-16 Merge branch 'ah/fix-http-push'
2014-07-16 Merge branch 'rs/code-cleaning'
2014-07-16 Merge branch 'jk/skip-prefix'
2014-07-16 Merge branch 'po/error-message-style'
2014-07-16 Merge branch 'jl/test-lint-scripts'
2014-07-16 Merge branch 'zk/log-graph-showsig'
2014-07-16 Merge branch 'mg/fix-log-mergetag-color'
2014-07-16 Merge branch 'kb/path-max-must-go'
2014-07-16 Merge branch 'cb/filter-branch-prune-empty-degenerate...
2014-07-16 Merge branch 'mk/merge-incomplete-files'
2014-06-30 git-merge-file: do not add LF at EOF while applying...
2014-06-30 t6023-merge-file.sh: fix and mark as broken invalid...
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-04 Merge branch 'vd/doc-unpack-objects'
2013-10-30 Merge branch 'jk/refs-c-squelch-gcc'
2013-10-30 Merge branch 'jk/date-c-double-semicolon'
2013-10-14 Merge branch 'rj/highlight-test-hang'
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-04-03 Merge branch 'jk/checkout-attribute-lookup' into maint...
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28 Merge branch 'jk/checkout-attribute-lookup'
2013-02-04 Merge branch 'dl/am-hg-locale' into maint
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-28 Merge branch 'dl/am-hg-locale'
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-14 Merge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14 Merge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14 Merge branch 'jl/interrupt-clone-remove-separate-git...
2013-01-12 Merge branch 'jk/maint-fast-import-doc-reorder'
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
next