projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge git-gui
[git] / merge-recursive.c
2006-10-19  Junio C HamanoMerge branch 'sb/fetch' blob | commitdiff | raw
2006-10-19  Junio C HamanoMerge branch 'sk/svn' blob | commitdiff | raw
2006-10-19  Junio C HamanoMerge branch 'rs/zip' blob | commitdiff | raw
2006-10-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2006-10-15  Junio C HamanoMerge branch 'jc/http' v1.4.3-rc3 blob | commitdiff | raw
2006-10-14  Rene ScharfeAdd hash_sha1_file() blob | commitdiff | raw
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
2006-07-28  Johannes Schindelinmerge-recur: Fix compiler warning with -pedantic blob | commitdiff | raw | diff to current
2006-07-28  Johannes Schindelinmerge-recur: Remove dead code blob | commitdiff | raw | diff to current
2006-07-28  Johannes Schindelinmerge-recur: Get rid of debug code blob | commitdiff | raw | diff to current
2006-07-28  Johannes Schindelinmerge-recur: Convert variable names to lower_case blob | commitdiff | raw | diff to current
2006-07-28  Johannes SchindelinCumulative update of merge-recursive in C blob | commitdiff | raw | diff to current
2006-07-14  Junio C HamanoMerge branch 'lt/unitype' into js/c-merge-recursive blob | commitdiff | raw | diff to current
2006-07-14  Johannes SchindelinStatus update on merge-recursive in C blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.