projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
merge-recursive: handle D/F conflict case more carefully.
[git] / unpack-trees.c
2007-04-10  Junio C HamanoTreat D/F conflict entry more carefully in unpack-trees... blob | commitdiff | raw
2007-04-10  Junio C Hamanot1000: fix case table. blob | commitdiff | raw | diff to current
2007-04-09  Junio C HamanoMerge branch 'jc/push' blob | commitdiff | raw | diff to current
2007-04-09  Junio C HamanoMerge branch 'jc/merge-subtree' blob | commitdiff | raw | diff to current
2007-04-09  Junio C HamanoMerge branch 'js/fetch-progress' blob | commitdiff | raw | diff to current
2007-04-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-04-08  Junio C HamanoMerge branch 'jc/read-tree-df' (early part) blob | commitdiff | raw | diff to current
2007-04-04  Junio C HamanoFix switching to a branch with D/F when current branch... blob | commitdiff | raw | diff to current
2007-04-04  Junio C HamanoFix twoway_merge that passed d/f conflict marker to... blob | commitdiff | raw | diff to current
2007-04-04  Junio C Hamanounpack-trees: get rid of *indpos parameter. blob | commitdiff | raw | diff to current
2007-04-04  Junio C Hamanounpack_trees.c: pass unpack_trees_options structure... blob | commitdiff | raw | diff to current
2007-04-04  Junio C HamanoMerge 1.5.0.7 in blob | commitdiff | raw | diff to current
2007-03-30  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-28  Junio C HamanoMerge branch 'maint' to synchronize with 1.5.0.6 blob | commitdiff | raw | diff to current
2007-03-26  Junio C HamanoMerge branch 'jc/fpl' blob | commitdiff | raw | diff to current
2007-03-25  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-25  Junio C HamanoMerge branch 'js/remote-show-push' blob | commitdiff | raw | diff to current
2007-03-25  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-24  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-22  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-03-22  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-03-21  Linus TorvaldsInitialize tree descriptors with a helper function... blob | commitdiff | raw | diff to current
2007-03-20  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-03-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-03-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint blob | commitdiff | raw | diff to current
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-02-14  Junio C HamanoMerge branch 'jc/diff-apply-patch' blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-02-12  Junio C HamanoMerge git-gui blob | commitdiff | raw | diff to current
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceMerge branch 'master' into sp/fast-import blob | commitdiff | raw | diff to current
2007-01-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-01-05  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-27  Junio C HamanoMerge branch 'master' into js/shallow blob | commitdiff | raw | diff to current
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive' blob | commitdiff | raw | diff to current
2006-12-22  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-21  Junio C HamanoMerge branch 'ew/svn-pm' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'jc/leftright' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'jc/blame' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'jc/branch-remove-remote' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'jc/clone' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-20  Junio C Hamanosimplify inclusion of system header files. 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 '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 'master' into js/merge blob | commitdiff | raw | diff to current
2006-12-06  Junio C HamanoMerge blob | commitdiff | raw | diff to current
2006-12-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-06  Junio C Hamanoread-tree: further loosen "working file will be lost... blob | commitdiff | raw | diff to current
2006-12-04  Junio C Hamanounpack-trees: make sure "df_conflict_entry.name" is... blob | commitdiff | raw | diff to current
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack' blob | commitdiff | raw | diff to current
2006-11-13  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-11-12  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-11-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-11-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-11-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-11-08  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-11-08  Junio C HamanoMerge branch 'jc/pickaxe' blob | commitdiff | raw | diff to current
2006-11-07  Junio C HamanoMerge branch 'jc/read-tree' blob | commitdiff | raw | diff to current
2006-10-28  Junio C Hamanomerge: loosen overcautious "working file will be lost... blob | commitdiff | raw | diff to current
2006-10-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-10-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-10-01  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm' blob | commitdiff | raw | diff to current
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack' blob | commitdiff | raw | diff to current
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http' blob | commitdiff | raw | diff to current
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-08-28  Junio C HamanoMerge branch 'js/c-merge-recursive' blob | commitdiff | raw | diff to current
2006-08-28  Junio C HamanoMerge branch 'ts/daemon' blob | commitdiff | raw | diff to current
2006-08-28  Junio C HamanoMerge branch 'jc/apply' blob | commitdiff | raw | diff to current
2006-08-26  Junio C HamanoMerge branch 'master' into gl/web blob | commitdiff | raw | diff to current
2006-08-26  Junio C HamanoMerge branch 'gl/cleanup' blob | commitdiff | raw | diff to current
2006-08-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next blob | commitdiff | raw | diff to current
2006-08-23  Shawn PearceConvert memcpy(a,b,20) to hashcpy(a,b). blob | commitdiff | raw | diff to current
2006-08-21  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-08-17  David RientjesDo not use memcmp(sha1_1, sha1_2, 20) with hardcoded... blob | commitdiff | raw | diff to current
2006-08-17  Junio C HamanoMerge branch 'jc/format-patch' blob | commitdiff | raw | diff to current
2006-08-16  Junio C HamanoMerge branch 'jc/racy' blob | commitdiff | raw | diff to current
2006-08-16  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-08-16  David Rientjesremove unnecessary initializations blob | commitdiff | raw | diff to current
2006-08-16  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-08-15  David Rientjesuse appropriate typedefs blob | commitdiff | raw | diff to current
2006-08-15  Junio C HamanoMerge branch 'master' into pb/gitpm blob | commitdiff | raw | diff to current
2006-08-14  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jc/upload-pack' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jc/racy-delay' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'jc/pack-objects' blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'js/read-tree' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.