projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Allow "make -w" generate its usual output
[git] / git-merge.sh
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw
2007-03-05  Junio C HamanoMerge branch 'js/fetch-progress' (early part) blob | commitdiff | raw
2007-03-05  Junio C HamanoMerge branch 'js/symlink' blob | commitdiff | raw
2007-03-04  Junio C HamanoMerge branch 'js/diff-ni' (early part) blob | commitdiff | raw
2007-03-04  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2007-03-03  Junio C Hamanogit-merge: fail correctly when we cannot fast forward. blob | commitdiff | raw
2007-03-02  Junio C HamanoMerge branch 'js/commit-format' blob | commitdiff | raw | diff to current
2007-02-28  Junio C HamanoMerge branch 'js/bundle' blob | commitdiff | raw | diff to current
2007-02-28  Junio C HamanoMerge branch 'mc/sendmail' blob | commitdiff | raw | diff to current
2007-02-26  Junio C HamanoMerge branch 'jc/merge-symlink' into maint blob | commitdiff | raw | diff to current
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint blob | commitdiff | raw | diff to current
2007-02-24  Junio C HamanoEvil Merge branch 'jc/status' (early part) into js... blob | commitdiff | raw | diff to current
2007-02-24  Junio C HamanoMerge branch 'js/apply' blob | commitdiff | raw | diff to current
2007-02-24  Junio C HamanoMerge branch 'js/no-limit-boundary' blob | commitdiff | raw | diff to current
2007-02-24  Junio C HamanoMerge branch 'js/etc-config' blob | commitdiff | raw | diff to current
2007-02-23  Junio C HamanoMerge branches 'lt/crlf' and 'jc/apply-config' blob | commitdiff | raw | diff to current
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-02-21  Junio C HamanoMerge branch 'fk/autoconf' blob | commitdiff | raw | diff to current
2007-02-21  Junio C HamanoMerge branch 'js/name-rev-fix' blob | commitdiff | raw | diff to current
2007-02-20  Junio C HamanoMerge branch 'js/diff-color-check' blob | commitdiff | raw | diff to current
2007-02-20  Junio C HamanoMerge branch 'jc/fetch-notags' blob | commitdiff | raw | diff to current
2007-02-19  Junio C HamanoMerge branch 'ap/cvsserver' blob | commitdiff | raw | diff to current
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint blob | commitdiff | raw | diff to current
2007-02-16  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-02-16  Junio C Hamanogit-merge: minor fix for no_trivial_merge_strategies. blob | commitdiff | raw | diff to current
2007-02-14  Junio C HamanoMerge branch 'js/reverse' blob | commitdiff | raw | diff to current
2007-02-14  Junio C HamanoMerge branch 'jc/diff-apply-patch' blob | commitdiff | raw | diff to current
2007-02-14  Junio C HamanoMerge branch 'jc/merge-base' (early part) blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-02-12  Junio C HamanoMerge git-gui blob | commitdiff | raw | diff to current
2007-02-04  Junio C HamanoMerge branch 'master' into np/dreflog blob | commitdiff | raw | diff to current
2007-01-31  Junio C HamanoMerge branch 'master' of git://linux-nfs.org/~bfields/git blob | commitdiff | raw | diff to current
2007-01-30  Shawn O. PearceMerge branch 'master' into sp/gfi blob | commitdiff | raw | diff to current
2007-01-29  Tom Prince[PATCH] Rename git-repo-config to git-config. blob | commitdiff | raw | diff to current
2007-01-26  Junio C Hamanogit-merge: leave sensible reflog message when used... blob | commitdiff | raw | diff to current
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-01-15  J. Bruce FieldsMerge branch 'master' of git://git./git/git blob | commitdiff | raw | diff to current
2007-01-14  Junio C HamanoMerge branch 'jc/int' blob | commitdiff | raw | diff to current
2007-01-14  Junio C HamanoMerge branch 'sp/merge' (early part) blob | commitdiff | raw | diff to current
2007-01-14  Junio C HamanoMerge branch 'jc/subdir' blob | commitdiff | raw | diff to current
2007-01-14  Shawn O. PearceMerge branch 'master' into sp/fast-import blob | commitdiff | raw | diff to current
2007-01-13  Junio C HamanoAllow whole-tree operations to be started from a subdir... blob | commitdiff | raw | diff to current
2007-01-12  Junio C HamanoMerge branch 'jc/bare' blob | commitdiff | raw | diff to current
2007-01-10  Shawn O. PearceImprove merge performance by avoiding in-index merges. blob | commitdiff | raw | diff to current
2007-01-10  Shawn O. PearceDisallow working directory commands in a bare repository. blob | commitdiff | raw | diff to current
2007-01-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-01-07  Junio C HamanoMerge branch 'sp/mmap' blob | commitdiff | raw | diff to current
2007-01-05  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-01-01  Junio C HamanoMerge branch 'sp/merge' (early part) blob | commitdiff | raw | diff to current
2007-01-01  Junio C Hamanofail pull/merge early in the middle of conflicted merge blob | commitdiff | raw | diff to current
2006-12-29  Junio C HamanoMerge branch 'jc/curl' blob | commitdiff | raw | diff to current
2006-12-29  Junio C HamanoMerge branch 'jc/utf8' blob | commitdiff | raw | diff to current
2006-12-29  Junio C HamanoMerge branch 'jc/make' blob | commitdiff | raw | diff to current
2006-12-28  Junio C HamanoMerge branch 'js/shallow' blob | commitdiff | raw | diff to current
2006-12-28  Shawn O. PearceHonor pull.{twohead,octopus} in git-merge. blob | commitdiff | raw | diff to current
2006-12-28  Shawn O. PearceUse GIT_REFLOG_ACTION environment variable instead. blob | commitdiff | raw | diff to current
2006-12-27  Junio C HamanoMerge branch 'master' into js/shallow blob | commitdiff | raw | diff to current
2006-12-27  Junio C HamanoMerge branch 'jc/fsck-reflog' blob | commitdiff | raw | diff to current
2006-12-25  Junio C HamanoMerge branch 'jc/skip-count' blob | commitdiff | raw | diff to current
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive' blob | commitdiff | raw | diff to current
2006-12-24  Junio C HamanoMerge branch 'sb/merge-friendly' blob | commitdiff | raw | diff to current
2006-12-24  Junio C HamanoMerge branch 'js/rerere' blob | commitdiff | raw | diff to current
2006-12-23  Shawn O. PearceDisplay 'theirs' branch name when possible in merge. blob | commitdiff | raw | diff to current
2006-12-22  Junio C Hamanomerge and reset: adjust for "reset --hard" messages blob | commitdiff | raw | diff to current
2006-12-22  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-21  Junio C HamanoMerge branch 'ew/svn-pm' blob | commitdiff | raw | diff to current
2006-12-20  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-18  Junio C HamanoMerge branch 'jc/blame-boundary' blob | commitdiff | raw | diff to current
2006-12-18  Junio C HamanoMerge branch 'jn/web' (early part) blob | commitdiff | raw | diff to current
2006-12-16  Junio C Hamanomerge: give a bit prettier merge message to "merge... blob | commitdiff | raw | diff to current
2006-12-14  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-14  Junio C HamanoMerge branch 'jc/diff--cached' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'jc/read-tree-ignore' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'ew/rerere' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'np/addcommit' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'lh/branch-rename' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'jc/commit-careful' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'ap/clone-origin' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'jc/numstat' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'rr/cvsexportcommit' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'ap/branch' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'js/merge' blob | commitdiff | raw | diff to current
2006-12-13  Junio C Hamanogit merge: reword failure message. blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'master' into js/merge blob | commitdiff | raw | diff to current
2006-12-13  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-07  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-06  Junio C Hamanogit-merge: fix "fix confusion between tag and branch... blob | commitdiff | raw | diff to current
2006-12-06  Junio C Hamanogit-merge: squelch needless error message. blob | commitdiff | raw | diff to current
2006-12-06  Junio C HamanoMerge blob | commitdiff | raw | diff to current
2006-12-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-06  Junio C HamanoLoosen "working file will be lost" check in Porcelain-ish blob | commitdiff | raw | diff to current
2006-12-05  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-03  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-12-03  Junio C Hamanogit-merge: fix confusion between tag and branch blob | commitdiff | raw | diff to current
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-11-29  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2006-11-29  Junio C HamanoMerge branch 'jc/globfetch' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.