Andrew's git / gitweb.git / history
?
Add `init.templatedir` configuration variable.
[gitweb.git] / t / t6024-recursive-merge.sh
2009-01-24 Merge branch 'tr/maint-no-index-fixes' into maint blob | diff | raw
2009-01-24 Merge branch 'rs/maint-shortlog-foldline' into maint blob | diff | raw
2009-01-24 Merge branch 'pj/maint-ldflags' into maint blob | diff | raw
2009-01-24 Merge branch 'pb/maint-git-pm-false-dir' into maint blob | diff | raw
2009-01-24 Merge branch 'js/maint-bisect-gitk' into maint blob | diff | raw
2009-01-24 Merge branch 'js/add-not-submodule' into maint blob | diff | raw
2009-01-24 Merge branch 'jc/maint-format-patch' into maint blob | diff | raw
2009-01-24 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-22 Merge branch 'kc/maint-diff-bwi-fix' blob | diff | raw
2009-01-22 Merge branch 'lt/maint-wrap-zlib' blob | diff | raw
2009-01-22 Merge branch 'sg/maint-gitdir-in-subdir' blob | diff | raw
2009-01-22 Merge branch 'jc/maint-format-patch-o-relative' blob | diff | raw
2009-01-21 Merge branch 'bs/maint-rename-populate-filespec' blob | diff | raw
2009-01-20 Merge branch 'kc/maint-diff-bwi-fix' blob | diff | raw
2009-01-18 Merge branch 'ds/uintmax-config' blob | diff | raw
2009-01-18 Merge branch 'gb/gitweb-opml' blob | diff | raw
2009-01-18 Merge branch 'mv/apply-parse-opt' blob | diff | raw
2009-01-18 Merge branch 'tr/rebase-root' blob | diff | raw
2009-01-18 Merge branch 'gb/gitweb-patch' blob | diff | raw
2009-01-18 Merge branch 'jc/maint-format-patch' blob | diff | raw
2009-01-18 Merge branch 'tr/maint-no-index-fixes' blob | diff | raw
2009-01-18 Merge branch 'as/autocorrect-alias' blob | diff | raw
2009-01-18 Merge branch 'rs/maint-shortlog-foldline' blob | diff | raw
2009-01-18 Merge branch 'mh/maint-commit-color-status' blob | diff | raw
2009-01-18 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-15 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-15 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-14 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-14 Merge branch 'nd/grep-assume-unchanged' blob | diff | raw
2009-01-14 Merge branch 'as/maint-shortlog-cleanup' blob | diff | raw
2009-01-14 Merge branch 'jc/maint-ls-tree' blob | diff | raw
2009-01-14 Merge branch 'js/bundle-tags' blob | diff | raw
2009-01-14 Merge branch 'js/add-not-submodule' blob | diff | raw
2009-01-14 Merge branch 'pb/maint-git-pm-false-dir' blob | diff | raw
2009-01-14 Merge branch 'pj/maint-ldflags' blob | diff | raw
2009-01-14 Merge branch 'fe/cvsserver' blob | diff | raw
2009-01-14 Merge branch 'js/maint-bisect-gitk' blob | diff | raw
2009-01-14 Merge branch 'np/no-loosen-prune-expire-now' blob | diff | raw
2009-01-14 Merge branch 'cb/maint-unpack-trees-absense' blob | diff | raw
2009-01-14 Merge branch 'mc/cd-p-pwd' blob | diff | raw
2009-01-14 Merge branch 'mh/cherry-default' blob | diff | raw
2009-01-13 Merge branch 'kk/maint-http-push' into maint blob | diff | raw
2009-01-13 Merge branch 'js/maint-merge-recursive-r-d-conflict... blob | diff | raw
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint blob | diff | raw | diff to current
2009-01-12 Merge branch 'maint' blob | diff | raw
2009-01-07 Merge branch 'mh/maint-sendmail-cc-doc' blob | diff | raw
2009-01-07 Merge branch 'rs/diff-ihc' blob | diff | raw
2009-01-07 Merge branch 'js/maint-merge-recursive-r-d-conflict' blob | diff | raw
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0 blob | diff | raw | diff to current
2009-01-03 Merge branch 'ap/maint-apply-modefix' blob | diff | raw | diff to current
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into... blob | diff | raw | diff to current
2008-12-25 merge-recursive: mark rename/delete conflict as unmerged blob | diff | raw
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-12-20 GIT 1.6.0.6 v1.6.0.6 blob | diff | raw | diff to current
2008-12-18 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-12-17 GIT 1.5.6.6 v1.5.6.6 blob | diff | raw | diff to current
2008-12-17 GIT 1.5.5.6 v1.5.5.6 blob | diff | raw | diff to current
2008-12-02 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-12-01 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-16 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-11-13 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-02 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-09-25 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-09-07 Merge updated git-gui and gitk that call each other blob | diff | raw | diff to current
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-08-17 Merge git-gui 0.11.0 blob | diff | raw | diff to current
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-08-14 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-13 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-12 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-09 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-06 Sync with 1.5.6.5 blob | diff | raw | diff to current
2008-08-06 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-08-06 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-03 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-30 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-27 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-25 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-24 Merge branch 'maint' into ph/checkout blob | diff | raw | diff to current
2008-07-21 Merge branch 'ap/trackinfo' v1.6.0-rc0 blob | diff | raw | diff to current
2008-07-21 Merge branch 'jc/rerere-auto-more' blob | diff | raw | diff to current
2008-07-21 Merge branch 'ns/am-abort' blob | diff | raw | diff to current
2008-07-21 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-19 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-17 Merge branch 'mv/dashless' blob | diff | raw | diff to current
2008-07-17 Merge branch 'ls/mailinfo' blob | diff | raw | diff to current
2008-07-17 Merge branch 'sb/dashless' blob | diff | raw | diff to current
2008-07-15 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-13 t/: Use "test_must_fail git" instead of "! git" blob | diff | raw | diff to current
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD blob | diff | raw | diff to current
next