projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge git-gui
[git] / merge-recursive.c
2007-02-12  Junio C HamanoMerge git-gui blob | commitdiff | raw
2007-02-08  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport blob | commitdiff | raw
2007-02-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport blob | commitdiff | raw
2007-02-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport blob | commitdiff | raw
2007-02-05  Junio C HamanoUse pretend_sha1_file() in git-blame and git-merge... blob | commitdiff | raw
2007-02-04  Junio C HamanoMerge branch 'master' into np/dreflog blob | commitdiff | raw | diff to current
2007-02-04  Shawn O. PearceKeep untracked files not involved in a merge. blob | commitdiff | raw | diff to current
2007-02-04  Pavel RoskinAssorted typo fixes blob | commitdiff | raw | diff to current
2007-01-31  Junio C HamanoMerge branch 'master' of git://linux-nfs.org/~bfields/git blob | commitdiff | raw | diff to current
2007-01-30  Shawn O. PearceMerge branch 'master' into sp/gfi 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-15  J. Bruce FieldsMerge branch 'master' of git://git./git/git blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceConvert output messages in merge-recursive to past... blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceDisplay a progress meter during merge-recursive. blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceEnable output buffering in merge-recursive. blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceAllow the user to control the verbosity of merge-recursive. blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceRemove unnecessary call_depth parameter in merge-recursive. blob | commitdiff | raw | diff to current
2007-01-14  Junio C HamanoMerge branch 'sp/merge' (early part) 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-12  Junio C Hamanomerge-recursive: do not report the resulting tree objec... blob | commitdiff | raw | diff to current
2007-01-12  Junio C HamanoMerge branch 'jc/bare' blob | commitdiff | raw | diff to current
2007-01-12  Junio C HamanoMerge branch 'ar/merge-recursive' blob | commitdiff | raw | diff to current
2007-01-12  Junio C HamanoMerge branch 'jc/detached-head' blob | commitdiff | raw | diff to current
2007-01-10  Junio C Hamanomerge-recursive: do not use on-file index when not... blob | commitdiff | raw | diff to current
2007-01-10  Alex RiesenSpeed-up recursive by flushing index only once for... blob | commitdiff | raw | diff to current
2007-01-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-01-08  Junio C HamanoMerge branch 'jc/reflog' blob | commitdiff | raw | diff to current
2007-01-08  Andy Whitcroftshort i/o: fix calls to write to use xwrite or write_in... blob | commitdiff | raw | diff to current
2007-01-07  Junio C HamanoMerge branch 'sp/mmap' blob | commitdiff | raw | diff to current
2007-01-05  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-01-01  Junio C HamanoMerge branch 'sp/merge' (early part) blob | commitdiff | raw | diff to current
2006-12-29  Shawn O. PearceAllow merging bare trees in merge-recursive. blob | commitdiff | raw | diff to current
2006-12-29  Shawn O. PearceMove better_branch_name above get_ref in merge-recursive. 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-27  Junio C HamanoMerge branch 'jc/fsck-reflog' blob | commitdiff | raw | diff to current
2006-12-25  Junio C HamanoMerge branch 'jc/skip-count' 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-24  Junio C HamanoMerge branch 'sb/merge-friendly' blob | commitdiff | raw | diff to current
2006-12-23  Shawn O. PearceDisplay 'theirs' branch name when possible in merge. blob | commitdiff | raw | diff to current
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
next
Unnamed repository; edit this file 'description' to name the repository.