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