projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
gitweb: Use rev-list --skip option.
[git] / merge-recursive.c
2006-12-25  Junio C HamanoMerge branch 'jc/skip-count' blob | commitdiff | raw
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive' blob | commitdiff | raw
2006-12-24  Junio C HamanoMerge branch 'sb/merge-friendly' blob | commitdiff | raw
2006-12-23  Shawn O. PearceDisplay 'theirs' branch name when possible in merge. blob | commitdiff | raw
2006-12-23  Shawn O. PearceUse extended SHA1 syntax in merge-recursive conflicts. 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-19  Junio C HamanoUse preprocessor constants for environment variable... 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  Shawn PearceRemove uncontested renamed files during merge. 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-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-11  Shawn O. PearceMake sure the empty tree exists when needed in merge... blob | commitdiff | raw | diff to current
2006-12-03  Junio C Hamanomerge-recursive: use xdl_merge(). 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-11-07  Junio C HamanoMerge branch 'np/index-pack' blob | commitdiff | raw | diff to current
2006-11-07  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-11-06  Alex Riesenmerge-recursive implicitely depends on trust_executable_bit blob | commitdiff | raw | diff to current
2006-11-01  Junio C HamanoMerge branch 'jc/refs-and-fetch' blob | commitdiff | raw | diff to current
2006-11-01  Junio C HamanoMerge branch 'lj/refs' blob | commitdiff | raw | diff to current
2006-10-28  Junio C Hamanomerge-recursive: adjust to loosened "working file clobb... blob | commitdiff | raw | diff to current
2006-10-28  Junio C Hamanomerge-recursive: make a few functions static. blob | commitdiff | raw | diff to current
2006-10-28  Junio C Hamanomerge-recursive: use abbreviated commit object name. blob | commitdiff | raw | diff to current
2006-10-25  Junio C HamanoMerge branch 'aw/cvsimport' blob | commitdiff | raw | diff to current
2006-10-25  Junio C HamanoMerge for-each-ref to sync gitweb fully with 'next' blob | commitdiff | raw | diff to current
2006-10-25  Junio C HamanoMerge branch 'jc/web-blame' blob | commitdiff | raw | diff to current
2006-10-24  Junio C HamanoMerge branch 'master' into jc/web blob | commitdiff | raw | diff to current
2006-10-23  Junio C HamanoMerge branch 'np/pack' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'mw/pathinfo' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'js/diff' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'jc/send-email' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'jc/grep' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge early part of branch 'jc/diff-apply-patch' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'jc/diff-numstat' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'mw/send-email' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'rs/rebase' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'sb/fetch' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'sk/svn' blob | commitdiff | raw | diff to current
2006-10-19  Junio C HamanoMerge branch 'rs/zip' blob | commitdiff | raw | diff to current
2006-10-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-10-15  Junio C HamanoMerge branch 'jc/http' v1.4.3-rc3 blob | commitdiff | raw | diff to current
2006-10-14  Rene ScharfeAdd hash_sha1_file() 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-07  Junio C HamanoMerge branch 'jc/daemon' blob | commitdiff | raw | diff to current
2006-09-03  Junio C HamanoMerge branch 'master' into cc/trace blob | commitdiff | raw | diff to current
2006-09-02  Shawn PearceReplace uses of strdup with xstrdup. 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-31  Jonas FonsecaUse xmalloc instead of malloc blob | commitdiff | raw | diff to current
2006-08-28  Junio C HamanoMerge branch 'gl/web' blob | commitdiff | raw | diff to current
2006-08-28  Junio C HamanoMerge branch 'gl/cleanup-next' 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-23  Junio C Hamanohashcpy/hashcmp remaining bits. 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-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next blob | commitdiff | raw | diff to current
2006-08-13  Junio C HamanoMerge branch 'master' into js/c-merge-recursive blob | commitdiff | raw | diff to current
2006-08-09  Johannes Schindelinmerge-recur: do not die unnecessarily blob | commitdiff | raw | diff to current
2006-08-09  Johannes Schindelinmerge-recur: try to merge older merge bases first blob | commitdiff | raw | diff to current
2006-08-09  Johannes Schindelinmerge-recur: if there is no common ancestor, fake empty one blob | commitdiff | raw | diff to current
2006-08-09  Johannes Schindelinmerge-recur: do not setenv("GIT_INDEX_FILE") blob | commitdiff | raw | diff to current
2006-08-09  Johannes Schindelinmerge-recur: do not call git-write-tree blob | commitdiff | raw | diff to current
2006-08-04  Johannes Schindelinmerge-recursive: fix rename handling blob | commitdiff | raw | diff to current
2006-07-31  Johannes Schindelinmerge-recur: virtual commits shall never be parsed blob | commitdiff | raw | diff to current
2006-07-31  Johannes Schindelinmerge-recur: use the unpack_trees() interface instead... blob | commitdiff | raw | diff to current
2006-07-31  Junio C HamanoMerge branch 'js/read-tree' into js/c-merge-recursive blob | commitdiff | raw | diff to current
2006-07-30  Johannes Schindelinmerge-recur: fix thinko in unique_path() blob | commitdiff | raw | diff to current
2006-07-28  Johannes Schindelinmerge-recur: Explain why sha_eq() and struct stage_data... blob | commitdiff | raw | diff to current
2006-07-28  Johannes Schindelinmerge-recur: Cleanup last mixedCase variables... blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.