cvsexportcommit -p : fix the usage of git-apply -C.
[gitweb.git] / git-merge.sh
2007-04-04 Merge 1.5.0.7 in
2007-03-30 Merge branch 'maint'
2007-03-28 Merge branch 'maint' to synchronize with 1.5.0.6
2007-03-26 Merge branch 'jc/fpl'
2007-03-25 Merge branch 'maint'
2007-03-25 Merge branch 'js/remote-show-push'
2007-03-25 Merge branch 'maint'
2007-03-24 Merge branch 'maint'
2007-03-22 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-22 Merge branch 'maint'
2007-03-22 git-merge: Put FETCH_HEAD data in merge commit message
2007-03-20 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-19 Merge branch 'fl/cvsserver'
2007-03-19 Merge branch 'sp/run-command'
2007-03-18 Merge branch 'ar/diff'
2007-03-17 Merge branch 'maint'
2007-03-16 git-merge: finish when git-read-tree fails
2007-03-14 Merge branch 'jc/repack'
2007-03-14 Merge branch 'jc/fetch'
2007-03-14 Merge branch 'jb/per-user-exclude'
2007-03-14 Merge branch 'pb/branch-track'
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-12 Merge branch 'maint'
2007-03-12 git-merge: warn when -m provided on a fast forward
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-05 Merge branch 'js/fetch-progress' (early part)
2007-03-05 Merge branch 'js/symlink'
2007-03-04 Merge branch 'js/diff-ni' (early part)
2007-03-04 Merge branch 'maint'
2007-03-03 git-merge: fail correctly when we cannot fast forward.
2007-03-02 Merge branch 'js/commit-format'
2007-02-28 Merge branch 'js/bundle'
2007-02-28 Merge branch 'mc/sendmail'
2007-02-27 Merge branch 'np/types' into jc/fetch
2007-02-26 Merge branch 'jc/merge-symlink' into maint
2007-02-25 Merge git://repo.or.cz/git-gui into maint
2007-02-24 Evil Merge branch 'jc/status' (early part) into js...
2007-02-24 Merge branch 'js/apply'
2007-02-24 Merge branch 'js/no-limit-boundary'
2007-02-24 Merge branch 'js/etc-config'
2007-02-23 Merge branches 'lt/crlf' and 'jc/apply-config'
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-21 Merge branch 'fk/autoconf'
2007-02-21 Merge branch 'js/name-rev-fix'
2007-02-20 Merge branch 'js/diff-color-check'
2007-02-20 Merge branch 'jc/fetch-notags'
2007-02-19 Merge branch 'ap/cvsserver'
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint
2007-02-16 Merge branch 'maint'
2007-02-16 git-merge: minor fix for no_trivial_merge_strategies.
2007-02-14 Merge branch 'js/reverse'
2007-02-14 Merge branch 'jc/diff-apply-patch'
2007-02-14 Merge branch 'jc/merge-base' (early part)
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Merge git-gui
2007-02-04 Merge branch 'master' into np/dreflog
2007-01-31 Merge branch 'master' of git://linux-nfs.org/~bfields/git
2007-01-30 Merge branch 'master' into sp/gfi
2007-01-29 [PATCH] Rename git-repo-config to git-config.
2007-01-26 git-merge: leave sensible reflog message when used...
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-15 Merge branch 'master' of git://git./git/git
2007-01-14 Merge branch 'jc/int'
2007-01-14 Merge branch 'sp/merge' (early part)
2007-01-14 Merge branch 'jc/subdir'
2007-01-14 Merge branch 'master' into sp/fast-import
2007-01-13 Allow whole-tree operations to be started from a subdir...
2007-01-12 Merge branch 'jc/bare'
2007-01-10 Improve merge performance by avoiding in-index merges.
2007-01-10 Disallow working directory commands in a bare repository.
2007-01-09 Merge branch 'maint'
2007-01-07 Merge branch 'sp/mmap'
2007-01-05 Merge branch 'maint'
2007-01-01 Merge branch 'sp/merge' (early part)
2007-01-01 fail pull/merge early in the middle of conflicted merge
2006-12-29 Merge branch 'jc/curl'
2006-12-29 Merge branch 'jc/utf8'
2006-12-29 Merge branch 'jc/make'
2006-12-28 Merge branch 'js/shallow'
2006-12-28 Honor pull.{twohead,octopus} in git-merge.
2006-12-28 Use GIT_REFLOG_ACTION environment variable instead.
2006-12-27 Merge branch 'master' into js/shallow
2006-12-27 Merge branch 'jc/fsck-reflog'
2006-12-25 Merge branch 'jc/skip-count'
2006-12-25 Merge branch 'jc/git-add--interactive'
2006-12-24 Merge branch 'sb/merge-friendly'
2006-12-24 Merge branch 'js/rerere'
2006-12-23 Display 'theirs' branch name when possible in merge.
2006-12-22 merge and reset: adjust for "reset --hard" messages
2006-12-22 Merge branch 'maint'
2006-12-21 Merge branch 'ew/svn-pm'
2006-12-20 Merge branch 'maint'
2006-12-18 Merge branch 'jc/blame-boundary'
2006-12-18 Merge branch 'jn/web' (early part)
2006-12-16 merge: give a bit prettier merge message to "merge...
2006-12-14 Merge branch 'maint'
2006-12-14 Merge branch 'jc/diff--cached'
2006-12-13 Merge branch 'jc/read-tree-ignore'
next