git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - merge-recursive.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / merge-recursive.c

2007-02-08	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git/fastimport	blob \| commitdiff \| raw
2007-02-07	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git/fastimport	blob \| commitdiff \| raw
2007-02-07	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git/fastimport	blob \| commitdiff \| raw
2007-02-05	Junio C Hamano	Use pretend_sha1_file() in git-blame and git-merge...	blob \| commitdiff \| raw
2007-02-04	Junio C Hamano	Merge branch 'master' into np/dreflog	blob \| commitdiff \| raw \| diff to current
2007-02-04	Shawn O. Pearce	Keep untracked files not involved in a merge.	blob \| commitdiff \| raw \| diff to current
2007-02-04	Pavel Roskin	Assorted typo fixes	blob \| commitdiff \| raw \| diff to current
2007-01-31	Junio C Hamano	Merge branch 'master' of git://linux-nfs.org/~bfields/git	blob \| commitdiff \| raw \| diff to current
2007-01-30	Shawn O. Pearce	Merge branch 'master' into sp/gfi	blob \| commitdiff \| raw \| diff to current
2007-01-15	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-01-15	J. Bruce Fields	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-01-14	Shawn O. Pearce	Convert output messages in merge-recursive to past...	blob \| commitdiff \| raw \| diff to current
2007-01-14	Shawn O. Pearce	Display a progress meter during merge-recursive.	blob \| commitdiff \| raw \| diff to current
2007-01-14	Shawn O. Pearce	Enable output buffering in merge-recursive.	blob \| commitdiff \| raw \| diff to current
2007-01-14	Shawn O. Pearce	Allow the user to control the verbosity of merge-recursive.	blob \| commitdiff \| raw \| diff to current
2007-01-14	Shawn O. Pearce	Remove unnecessary call_depth parameter in merge-recursive.	blob \| commitdiff \| raw \| diff to current
2007-01-14	Junio C Hamano	Merge branch 'sp/merge' (early part)	blob \| commitdiff \| raw \| diff to current
2007-01-14	Shawn O. Pearce	Merge branch 'master' into sp/fast-import	blob \| commitdiff \| raw \| diff to current
2007-01-12	Junio C Hamano	merge-recursive: do not report the resulting tree objec...	blob \| commitdiff \| raw \| diff to current
2007-01-12	Junio C Hamano	Merge branch 'jc/bare'	blob \| commitdiff \| raw \| diff to current
2007-01-12	Junio C Hamano	Merge branch 'ar/merge-recursive'	blob \| commitdiff \| raw \| diff to current
2007-01-12	Junio C Hamano	Merge branch 'jc/detached-head'	blob \| commitdiff \| raw \| diff to current
2007-01-10	Junio C Hamano	merge-recursive: do not use on-file index when not...	blob \| commitdiff \| raw \| diff to current
2007-01-10	Alex Riesen	Speed-up recursive by flushing index only once for...	blob \| commitdiff \| raw \| diff to current
2007-01-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-01-08	Junio C Hamano	Merge branch 'jc/reflog'	blob \| commitdiff \| raw \| diff to current
2007-01-08	Andy Whitcroft	short i/o: fix calls to write to use xwrite or write_in...	blob \| commitdiff \| raw \| diff to current
2007-01-07	Junio C Hamano	Merge branch 'sp/mmap'	blob \| commitdiff \| raw \| diff to current
2007-01-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-01-01	Junio C Hamano	Merge branch 'sp/merge' (early part)	blob \| commitdiff \| raw \| diff to current
2006-12-29	Shawn O. Pearce	Allow merging bare trees in merge-recursive.	blob \| commitdiff \| raw \| diff to current
2006-12-29	Shawn O. Pearce	Move better_branch_name above get_ref in merge-recursive.	blob \| commitdiff \| raw \| diff to current
2006-12-27	Junio C Hamano	Merge branch 'master' into js/shallow	blob \| commitdiff \| raw \| diff to current
2006-12-27	Junio C Hamano	Merge branch 'jc/fsck-reflog'	blob \| commitdiff \| raw \| diff to current
2006-12-25	Junio C Hamano	Merge branch 'jc/skip-count'	blob \| commitdiff \| raw \| diff to current
2006-12-25	Junio C Hamano	Merge branch 'jc/git-add--interactive'	blob \| commitdiff \| raw \| diff to current
2006-12-24	Junio C Hamano	Merge branch 'sb/merge-friendly'	blob \| commitdiff \| raw \| diff to current
2006-12-23	Shawn O. Pearce	Display 'theirs' branch name when possible in merge.	blob \| commitdiff \| raw \| diff to current
2006-12-23	Shawn O. Pearce	Use extended SHA1 syntax in merge-recursive conflicts.	blob \| commitdiff \| raw \| diff to current
2006-12-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-21	Junio C Hamano	Merge branch 'ew/svn-pm'	blob \| commitdiff \| raw \| diff to current
2006-12-20	Junio C Hamano	Merge branch 'jc/leftright'	blob \| commitdiff \| raw \| diff to current
2006-12-20	Junio C Hamano	Merge branch 'jc/blame'	blob \| commitdiff \| raw \| diff to current
2006-12-20	Junio C Hamano	Merge branch 'jc/branch-remove-remote'	blob \| commitdiff \| raw \| diff to current
2006-12-20	Junio C Hamano	Merge branch 'jc/clone'	blob \| commitdiff \| raw \| diff to current
2006-12-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-20	Junio C Hamano	simplify inclusion of system header files.	blob \| commitdiff \| raw \| diff to current
2006-12-19	Junio C Hamano	Use preprocessor constants for environment variable...	blob \| commitdiff \| raw \| diff to current
2006-12-18	Junio C Hamano	Merge branch 'jn/web' (early part)	blob \| commitdiff \| raw \| diff to current
2006-12-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-14	Junio C Hamano	Merge branch 'jc/diff--cached'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'jc/read-tree-ignore'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'ew/rerere'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'np/addcommit'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'lh/branch-rename'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'jc/commit-careful'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'ap/clone-origin'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'jc/numstat'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'rr/cvsexportcommit'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'ap/branch'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'js/merge'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Shawn Pearce	Remove uncontested renamed files during merge.	blob \| commitdiff \| raw \| diff to current
2006-12-13	Johannes Schindelin	merge-recursive: add/add really is modify/modify with...	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'master' into js/merge	blob \| commitdiff \| raw \| diff to current
2006-12-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-11	Shawn O. Pearce	Make sure the empty tree exists when needed in merge...	blob \| commitdiff \| raw \| diff to current
2006-12-03	Junio C Hamano	merge-recursive: use xdl_merge().	blob \| commitdiff \| raw \| diff to current
2006-11-29	Junio C Hamano	Merge master.kernel.org:/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-11-24	Junio C Hamano	Merge branch 'jc/upload-pack'	blob \| commitdiff \| raw \| diff to current
2006-11-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge branch 'jc/pickaxe'	blob \| commitdiff \| raw \| diff to current
2006-11-07	Junio C Hamano	Merge branch 'jc/read-tree'	blob \| commitdiff \| raw \| diff to current
2006-11-07	Junio C Hamano	Merge branch 'np/index-pack'	blob \| commitdiff \| raw \| diff to current
2006-11-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-06	Alex Riesen	merge-recursive implicitely depends on trust_executable_bit	blob \| commitdiff \| raw \| diff to current
2006-11-01	Junio C Hamano	Merge branch 'jc/refs-and-fetch'	blob \| commitdiff \| raw \| diff to current
2006-11-01	Junio C Hamano	Merge branch 'lj/refs'	blob \| commitdiff \| raw \| diff to current
2006-10-28	Junio C Hamano	merge-recursive: adjust to loosened "working file clobb...	blob \| commitdiff \| raw \| diff to current
2006-10-28	Junio C Hamano	merge-recursive: make a few functions static.	blob \| commitdiff \| raw \| diff to current
2006-10-28	Junio C Hamano	merge-recursive: use abbreviated commit object name.	blob \| commitdiff \| raw \| diff to current
2006-10-25	Junio C Hamano	Merge branch 'aw/cvsimport'	blob \| commitdiff \| raw \| diff to current
2006-10-25	Junio C Hamano	Merge for-each-ref to sync gitweb fully with 'next'	blob \| commitdiff \| raw \| diff to current
2006-10-25	Junio C Hamano	Merge branch 'jc/web-blame'	blob \| commitdiff \| raw \| diff to current
2006-10-24	Junio C Hamano	Merge branch 'master' into jc/web	blob \| commitdiff \| raw \| diff to current
2006-10-23	Junio C Hamano	Merge branch 'np/pack'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'mw/pathinfo'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'js/diff'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'jc/send-email'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'jc/grep'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge early part of branch 'jc/diff-apply-patch'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'jc/diff-numstat'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'mw/send-email'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'rs/rebase'	blob \| commitdiff \| raw \| diff to current
2006-10-19	Junio C Hamano	Merge branch 'sb/fetch'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom