checkout -m --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t0020-crlf.sh
2009-06-22 Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
2009-06-21 Merge branch 'maint-1.6.2' into maint
2009-06-21 Merge branch 'pb/maint-1.6.2-userdiff-fix'
2009-06-21 Merge branch 'sb/maint-1.6.0-add-config-fix'
2009-06-20 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-14 Merge branch 'maint-1.6.2' into maint
2009-06-11 Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-06-02 Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
2009-06-02 Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
2009-05-29 Merge branch 'sb/maint-1.6.2-opt-filename-fix'
2009-05-26 Merge branch 'js/maint-no-ln-across-libexec-and-bin...
2009-05-26 Merge branch 'lt/maint-diff-reduce-lstat' into maint
2009-05-26 Merge branch 'do/maint-merge-recursive-fix' into maint
2009-05-26 Merge branch 'jk/maint-1.6.0-trace-argv' into maint
2009-05-25 Merge branch 'master' into sb/opt-filename
2009-05-24 Merge branch 'maint-1.6.2' into maint
2009-05-23 Merge branch 'mg/track'
2009-05-23 Merge branch 'js/maint-no-ln-across-libexec-and-bin'
2009-05-23 Merge branch 'lt/maint-diff-reduce-lstat'
2009-05-23 Merge branch 'do/maint-merge-recursive-fix'
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv'
2009-05-16 Merge branch 'maint-1.6.2' into maint
2009-05-12 Merge branch 'maint-1.6.2' into maint
2009-05-06 Merge branch 'maint'
2009-05-03 Sync with GIT 1.6.2.5
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-29 Merge branch 'maint'
2009-04-28 Merge branch 'maint'
2009-04-25 Merge branch 'maint'
2009-04-23 Merge branch 'jc/maint-read-tree-multi'
2009-04-21 Merge branch 'mk/maint-apply-swap'
2009-04-21 Merge branch 'maint'
2009-04-20 Merge branch 'mm/maint-add-p-quit'
2009-04-20 Sync with 1.6.2.4
2009-04-18 Merge branch 'lt/pack-object-memuse'
2009-04-18 Merge branch 'maint'
2009-04-18 Merge branch 'maint'
2009-04-13 Mark t1301 permission test to depend on POSIXPERM
2009-04-12 Merge branch 'maint'
2009-04-09 Merge branch 'maint'
2009-04-08 Merge branch 'maint'
2009-04-08 Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
2009-04-08 Merge branch 'js/maint-submodule-checkout'
2009-04-08 Merge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-06 Merge branch 'jc/name-branch'
2009-04-06 Merge branch 'jc/shared-literally'
2009-04-06 Merge branch 'sb/format-patch-patchname'
2009-04-05 Merge branch 'maint'
2009-04-05 Merge branch 'cc/sha1-bsearch' into HEAD
2009-04-02 Sync with 1.6.2.2
2009-04-02 Merge branch 'ef/fast-export'
2009-04-02 Merge branch 'tr/maint-1.6.1-doc-format-patch--root'
2009-04-02 Merge branch 'maint'
2009-04-02 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-04-02 Merge branch 'kb/tracking-count-no-merges'
2009-03-30 Merge branch 'maint'
2009-03-30 Merge branch 'maint'
2009-03-28 Merge branch 'maint'
2009-03-28 Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-28 Merge branch 'js/remote-improvements'
2009-03-28 Merge branch 'jk/clone-post-checkout'
2009-03-27 Merge branch 'db/push-cleanup'
2009-03-26 Merge branch 'maint'
2009-03-26 Merge branch 'db/push-cleanup'
2009-03-26 Merge branch 'jc/maint-1.6.0-blame-s'
2009-03-26 Merge branch 'mg/http-auth'
2009-03-26 Merge branch 'jk/reflog-date'
2009-03-26 Merge branch 'jc/attributes-checkout'
2009-03-20 Add a test for checking whether gitattributes is honore...
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'maint-1.5.4' into maint-1.5.5
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Merge branch 'ap/maint-apply-modefix'
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-17 GIT 1.5.5.6 v1.5.5.6
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Merge branch 'maint'
2008-08-13 Merge branch 'maint'
2008-08-12 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
next