Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

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