Add a test for merging changed and rename-changed branches
[git/git.git] / t / t6022-merge-rename.sh
2007-04-26 Alex RiesenAdd a test for merging changed and rename-changed branches
2007-04-18 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-04-18 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-04-15 Junio C HamanoMerge git://git2./pub/scm/gitk/gitk into maint
2007-03-22 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-20 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-03-12 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-06 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-25 Junio C HamanoMerge git://repo.or.cz/git-gui into maint
2007-02-21 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18 Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Junio C HamanoMerge git-gui
2007-01-15 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14 Shawn O. PearceMerge branch 'master' into sp/fast-import
2006-11-29 Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24 Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-13 Junio C HamanoMerge branch 'maint'
2006-11-12 Junio C HamanoMerge branch 'maint'
2006-11-11 Junio C HamanoMerge branch 'maint'
2006-11-09 Junio C HamanoMerge branch 'maint'
2006-11-09 Junio C HamanoMerge branch 'maint'
2006-11-08 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08 Junio C HamanoMerge branch 'maint'
2006-11-08 Junio C HamanoMerge branch 'jc/pickaxe'
2006-11-07 Junio C HamanoMerge branch 'jc/read-tree'
2006-11-07 Junio C HamanoMerge branch 'maint'
2006-11-05 Junio C HamanoMerge branch 'maint'
2006-11-05 Junio C HamanoMerge branch 'pb/web'
2006-11-04 Junio C HamanoMerge branch 'maint'
2006-11-03 Junio C HamanoMerge branch 'sp/keep-pack' into np/index-pack
2006-11-03 Junio C HamanoMerge branch 'maint'
2006-11-01 Junio C HamanoMerge branch 'maint'
2006-11-01 Junio C HamanoMerge branch 'rs/cherry'
2006-11-01 Junio C HamanoMerge branch 'jc/refs-and-fetch'
2006-11-01 Junio C HamanoMerge branch 'lj/refs'
2006-10-31 Junio C HamanoMerge branch 'maint'
2006-10-29 Junio C HamanoMerge early part of branch 'np/index-pack' into sp...
2006-10-28 Junio C Hamanot6022: ignoring untracked files by merge-recursive...
2006-10-27 Junio C Hamanotests: merge-recursive is usable without Python
2006-09-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-18 Junio C HamanoMerge branch 'jc/rw-prefix'
2006-06-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Junio C HamanoMerge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-29 Junio C HamanoMerge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
2006-05-28 Junio C HamanoMerge branch 'jc/cache-tree' into next
2006-05-24 Junio C HamanoMerge branch 'master' into sp/reflog
2006-05-24 Junio C HamanoMerge branch 'lt/dirwalk'
2006-05-23 Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-21 Junio C HamanoMerge branch 'master' into js/fmt-patch
2006-05-20 Junio C HamanoMerge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
2006-05-20 Junio C HamanoMerge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
2006-05-20 Junio C HamanoMerge branch 'js/fetchconfig'
2006-05-20 Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-20 Junio C HamanoMerge branch 'jc/read-tree-safety'
2006-05-19 Junio C HamanoMerge branch 'eb/quilt' into next
2006-05-19 Junio C HamanoMerge branch 'ts/doctar' into next
2006-05-19 Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18 Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18 Junio C HamanoMerge branch 'master' into next
2006-05-18 Junio C HamanoMerge branch 'lt/dirwalk' into next
2006-05-18 Junio C HamanoMerge branch 'sp/reflog' into next
2006-05-17 Junio C HamanoMerge branch 'jc/apply' into next
2006-05-17 Junio C HamanoMerge branch 'jc/read-tree-safety' into next
2006-05-17 Junio C Hamanoread-tree -m -u: do not overwrite or remove untracked...
2006-05-03 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Junio C HamanoMerge branch 'maint'
2006-04-05 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Junio C HamanoMerge branch 'fix'
2006-04-04 Junio C HamanoMerge branch 'lt/fix-sol-pack'
2006-04-04 Junio C HamanoMerge branch 'lt/fix-sol-pack' into next
2006-04-02 Junio C HamanoMerge branch 'lt/fix-sol-pack' into next
2006-03-31 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-04 Junio C HamanoMerge branch 'maint'
2006-03-02 Junio C HamanoMerge branch 'maint'
2006-03-02 Junio C HamanoMerge branch 'jc/tag'
2006-03-02 Junio C HamanoMerge branch 'jc/tag' into next
2006-03-02 Junio C HamanoUp to date with GIT 1.2.4 fixes
2006-03-01 Junio C HamanoMerge git-mv fixes from 'maint'
2006-02-26 Junio C HamanoMerge branch 'maint'
2006-02-25 Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin'
2006-02-25 Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin'
2006-02-24 Junio C HamanoMerge fixes early for next maint series.
2006-02-24 Junio C HamanoMerge branches 'jc/rev-list' and 'jc/pack-thin' into...
2006-02-24 Junio C HamanoMerge fix bits from jc/rev-list
2006-02-24 Junio C HamanoMerge fixes early for next maint series.
2006-02-23 Junio C HamanoMerge part of pack-thin branch
2006-02-23 Junio C HamanoMerge branches 'maint', 'jc/fix-co-candy' and 'jc/fix...
2006-02-23 Junio C HamanoMerge branch 'ra/anno'
2006-02-23 Junio C HamanoMerge fixes up to GIT 1.2.3
next