A new merge stragety 'subtree'.
[git/git.git] / git-merge.sh
2007-04-07 Junio C HamanoA new merge stragety 'subtree'.
2007-04-04 Junio C HamanoMerge 1.5.0.7 in
2007-03-30 Junio C HamanoMerge branch 'maint'
2007-03-28 Junio C HamanoMerge branch 'maint' to synchronize with 1.5.0.6
2007-03-26 Junio C HamanoMerge branch 'jc/fpl'
2007-03-25 Junio C HamanoMerge branch 'maint'
2007-03-25 Junio C HamanoMerge branch 'js/remote-show-push'
2007-03-25 Junio C HamanoMerge branch 'maint'
2007-03-24 Junio C HamanoMerge branch 'master' into jc/bisect
2007-03-24 Junio C HamanoMerge branch 'maint'
2007-03-22 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-22 Junio C HamanoMerge branch 'maint'
2007-03-22 Michael S. Tsirkingit-merge: Put FETCH_HEAD data in merge commit message
2007-03-20 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-19 Junio C HamanoMerge branch 'fl/cvsserver'
2007-03-19 Junio C HamanoMerge branch 'sp/run-command'
2007-03-18 Junio C HamanoMerge branch 'ar/diff'
2007-03-17 Junio C HamanoMerge branch 'maint'
2007-03-16 Santi Béjargit-merge: finish when git-read-tree fails
2007-03-14 Junio C HamanoMerge branch 'jc/repack'
2007-03-14 Junio C HamanoMerge branch 'jc/fetch'
2007-03-14 Junio C HamanoMerge branch 'jb/per-user-exclude'
2007-03-14 Junio C HamanoMerge branch 'pb/branch-track'
2007-03-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-03-12 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-12 Junio C HamanoMerge branch 'maint'
2007-03-12 J. Bruce Fieldsgit-merge: warn when -m provided on a fast forward
2007-03-06 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-05 Junio C HamanoMerge branch 'js/fetch-progress' (early part)
2007-03-05 Junio C HamanoMerge branch 'js/symlink'
2007-03-04 Junio C HamanoMerge branch 'js/diff-ni' (early part)
2007-03-04 Junio C HamanoMerge branch 'maint'
2007-03-03 Junio C Hamanogit-merge: fail correctly when we cannot fast forward.
2007-03-02 Junio C HamanoMerge branch 'js/commit-format'
2007-02-28 Junio C HamanoMerge branch 'js/bundle'
2007-02-28 Junio C HamanoMerge branch 'mc/sendmail'
2007-02-27 Junio C HamanoMerge branch 'np/types' into jc/fetch
2007-02-26 Junio C HamanoMerge branch 'jc/merge-symlink' into maint
2007-02-25 Junio C HamanoMerge git://repo.or.cz/git-gui into maint
2007-02-24 Junio C HamanoEvil Merge branch 'jc/status' (early part) into js...
2007-02-24 Junio C HamanoMerge branch 'js/apply'
2007-02-24 Junio C HamanoMerge branch 'js/no-limit-boundary'
2007-02-24 Junio C HamanoMerge branch 'js/etc-config'
2007-02-23 Junio C HamanoMerge branches 'lt/crlf' and 'jc/apply-config'
2007-02-21 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-21 Junio C HamanoMerge branch 'fk/autoconf'
2007-02-21 Junio C HamanoMerge branch 'js/name-rev-fix'
2007-02-20 Junio C HamanoMerge branch 'js/diff-color-check'
2007-02-20 Junio C HamanoMerge branch 'jc/fetch-notags'
2007-02-19 Junio C HamanoMerge branch 'ap/cvsserver'
2007-02-18 Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint
2007-02-16 Junio C HamanoMerge branch 'maint'
2007-02-16 Junio C Hamanogit-merge: minor fix for no_trivial_merge_strategies.
2007-02-14 Junio C HamanoMerge branch 'js/reverse'
2007-02-14 Junio C HamanoMerge branch 'jc/diff-apply-patch'
2007-02-14 Junio C HamanoMerge branch 'jc/merge-base' (early part)
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Junio C HamanoMerge git-gui
2007-02-04 Junio C HamanoMerge branch 'master' into np/dreflog
2007-01-31 Junio C HamanoMerge branch 'master' of git://linux-nfs.org/~bfields/git
2007-01-30 Shawn O. PearceMerge branch 'master' into sp/gfi
2007-01-29 Tom Prince[PATCH] Rename git-repo-config to git-config.
2007-01-26 Junio C Hamanogit-merge: leave sensible reflog message when used...
2007-01-15 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-15 J. Bruce FieldsMerge branch 'master' of git://git./git/git
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-14 Shawn O. PearceMerge branch 'master' into sp/fast-import
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'
next