Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"
[git] / git-merge.sh
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14  Junio C HamanoMerge branch 'jc/int'
2007-01-14  Junio C HamanoMerge branch 'sp/merge' (early part)
2007-01-14  Junio C HamanoMerge branch 'jc/subdir'
2007-01-13  Junio C HamanoAllow whole-tree operations to be started from a subdir...
2007-01-12  Junio C HamanoMerge branch 'jc/bare'
2007-01-10  Shawn O. PearceImprove merge performance by avoiding in-index merges.
2007-01-10  Shawn O. PearceDisallow working directory commands in a bare repository.
2007-01-09  Junio C HamanoMerge branch 'maint'
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)
2007-01-01  Junio C Hamanofail pull/merge early in the middle of conflicted merge
2006-12-29  Junio C HamanoMerge branch 'jc/curl'
2006-12-29  Junio C HamanoMerge branch 'jc/utf8'
2006-12-29  Junio C HamanoMerge branch 'jc/make'
2006-12-28  Junio C HamanoMerge branch 'js/shallow'
2006-12-28  Shawn O. PearceHonor pull.{twohead,octopus} in git-merge.
2006-12-28  Shawn O. PearceUse GIT_REFLOG_ACTION environment variable instead.
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-24  Junio C HamanoMerge branch 'js/rerere'
2006-12-23  Shawn O. PearceDisplay 'theirs' branch name when possible in merge.
2006-12-22  Junio C Hamanomerge and reset: adjust for "reset --hard" messages
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 'maint'
2006-12-18  Junio C HamanoMerge branch 'jc/blame-boundary'
2006-12-18  Junio C HamanoMerge branch 'jn/web' (early part)
2006-12-16  Junio C Hamanomerge: give a bit prettier merge message to "merge...
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  Junio C Hamanogit merge: reword failure message.
2006-12-13  Junio C HamanoMerge branch 'maint'
2006-12-13  Junio C HamanoMerge branch 'master' into js/merge
2006-12-13  Junio C HamanoMerge branch 'maint'
2006-12-11  Junio C HamanoMerge branch 'maint'
2006-12-07  Junio C HamanoMerge branch 'maint'
2006-12-06  Junio C Hamanogit-merge: fix "fix confusion between tag and branch...
2006-12-06  Junio C Hamanogit-merge: squelch needless error message.
2006-12-06  Junio C HamanoMerge
2006-12-06  Junio C HamanoMerge branch 'maint'
2006-12-06  Junio C HamanoLoosen "working file will be lost" check in Porcelain-ish
2006-12-05  Junio C HamanoMerge branch 'maint'
2006-12-03  Junio C HamanoMerge branch 'maint'
2006-12-03  Junio C Hamanogit-merge: fix confusion between tag and branch
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-29  Junio C HamanoMerge branch 'maint'
2006-11-29  Junio C HamanoMerge branch 'jc/globfetch'
2006-11-29  Junio C HamanoMerge branch 'maint'
2006-11-27  Junio C HamanoMerge branch 'js/shortlog'
2006-11-27  Junio C HamanoMerge branch 'jc/push-delete-ref'
2006-11-27  Junio C HamanoMerge branch 'jc/merge'
2006-11-27  Junio C Hamanogit-merge: do not leak rev-parse output used for checki...
2006-11-27  Junio C Hamanogit-merge: tighten error checking.
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-22  Junio C Hamanomerge: allow merging into a yet-to-be-born branch.
2006-11-22  Junio C Hamanogit-merge: make it usable as the first class UI
2006-11-22  Junio C Hamanoremove merge-recursive-old
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 'maint'
2006-11-05  Junio C HamanoMerge branch 'maint'
2006-11-04  Junio C HamanoMerge branch 'maint'
2006-11-03  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'jc/refs-and-fetch'
2006-11-01  Junio C HamanoMerge branch 'lj/refs'
2006-10-31  Junio C HamanoMerge branch 'maint'
2006-10-27  Junio C HamanoMerge branch 'maint'
2006-10-26  Junio C HamanoMerge branch 'jc/combined'
2006-10-26  Junio C HamanoMerge branch 'jc/combined'
2006-10-25  Junio C HamanoMerge branch 'maint'
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-25  Junio C HamanoMerge branch 'maint'
2006-10-24  Junio C HamanoMerge branch 'master' into jc/web
2006-10-24  Junio C HamanoMerge branch 'maint'
2006-10-23  Junio C HamanoMerge branch 'np/pack'
2006-10-23  Junio C HamanoMerge branch 'maint'
next