]> asedeno.scripts.mit.edu Git - git.git/history - t/t6024-recursive-merge.sh
projects / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Display 'theirs' branch name when possible in merge.
[git.git] / t / t6024-recursive-merge.sh
2006-12-23 Shawn O. PearceDisplay 'theirs' branch name when possible in merge. blob | commitdiff | raw
2006-12-22 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-20 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-18 Junio C HamanoMerge branch 'jn/web' (early part) blob | commitdiff | raw | diff to current
2006-12-14 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-14 Junio C HamanoMerge branch 'jc/diff--cached' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'jc/read-tree-ignore' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'ew/rerere' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'np/addcommit' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'lh/branch-rename' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'jc/commit-careful' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'ap/clone-origin' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'jc/numstat' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'rr/cvsexportcommit' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'ap/branch' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'js/merge' blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-13 Johannes Schindelinmerge-recursive: add/add really is modify/modify with... blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'master' into js/merge blob | commitdiff | raw | diff to current
2006-12-13 Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-13 Junio C Hamanoadd test case for recursive merge blob | commitdiff | raw | diff to current
local clone of git.git