git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - git-merge.sh

projects / thirdparty / git.git / history

2007-04-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-04-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-04-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-04-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2007-04-09	Junio C Hamano	Merge branch 'jc/push'	blob \| commitdiff \| raw
2007-04-09	Junio C Hamano	Merge branch 'jc/merge-subtree'	blob \| commitdiff \| raw
2007-04-09	Junio C Hamano	Merge branch 'js/fetch-progress'	blob \| commitdiff \| raw \| diff to current
2007-04-07	Junio C Hamano	A new merge stragety 'subtree'.	blob \| commitdiff \| raw
2007-04-04	Junio C Hamano	Merge 1.5.0.7 in	blob \| commitdiff \| raw \| diff to current
2007-03-30	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-28	Junio C Hamano	Merge branch 'maint' to synchronize with 1.5.0.6	blob \| commitdiff \| raw \| diff to current
2007-03-26	Junio C Hamano	Merge branch 'jc/fpl'	blob \| commitdiff \| raw \| diff to current
2007-03-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-25	Junio C Hamano	Merge branch 'js/remote-show-push'	blob \| commitdiff \| raw \| diff to current
2007-03-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-24	Junio C Hamano	Merge branch 'master' into jc/bisect	blob \| commitdiff \| raw \| diff to current
2007-03-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-22	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-03-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-22	Michael S. Tsirkin	git-merge: Put FETCH_HEAD data in merge commit message	blob \| commitdiff \| raw \| diff to current
2007-03-20	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-03-19	Junio C Hamano	Merge branch 'fl/cvsserver'	blob \| commitdiff \| raw \| diff to current
2007-03-19	Junio C Hamano	Merge branch 'sp/run-command'	blob \| commitdiff \| raw \| diff to current
2007-03-18	Junio C Hamano	Merge branch 'ar/diff'	blob \| commitdiff \| raw \| diff to current
2007-03-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-16	Santi Béjar	git-merge: finish when git-read-tree fails	blob \| commitdiff \| raw \| diff to current
2007-03-14	Junio C Hamano	Merge branch 'jc/repack'	blob \| commitdiff \| raw \| diff to current
2007-03-14	Junio C Hamano	Merge branch 'jc/fetch'	blob \| commitdiff \| raw \| diff to current
2007-03-14	Junio C Hamano	Merge branch 'jb/per-user-exclude'	blob \| commitdiff \| raw \| diff to current
2007-03-14	Junio C Hamano	Merge branch 'pb/branch-track'	blob \| commitdiff \| raw \| diff to current
2007-03-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-03-12	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-03-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-12	J. Bruce Fields	git-merge: warn when -m provided on a fast forward	blob \| commitdiff \| raw \| diff to current
2007-03-06	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-03-05	Junio C Hamano	Merge branch 'js/fetch-progress' (early part)	blob \| commitdiff \| raw \| diff to current
2007-03-05	Junio C Hamano	Merge branch 'js/symlink'	blob \| commitdiff \| raw \| diff to current
2007-03-04	Junio C Hamano	Merge branch 'js/diff-ni' (early part)	blob \| commitdiff \| raw \| diff to current
2007-03-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-03-03	Junio C Hamano	git-merge: fail correctly when we cannot fast forward.	blob \| commitdiff \| raw \| diff to current
2007-03-02	Junio C Hamano	Merge branch 'js/commit-format'	blob \| commitdiff \| raw \| diff to current
2007-02-28	Junio C Hamano	Merge branch 'js/bundle'	blob \| commitdiff \| raw \| diff to current
2007-02-28	Junio C Hamano	Merge branch 'mc/sendmail'	blob \| commitdiff \| raw \| diff to current
2007-02-27	Junio C Hamano	Merge branch 'np/types' into jc/fetch	blob \| commitdiff \| raw \| diff to current
2007-02-26	Junio C Hamano	Merge branch 'jc/merge-symlink' into maint	blob \| commitdiff \| raw \| diff to current
2007-02-25	Junio C Hamano	Merge git://repo.or.cz/git-gui into maint	blob \| commitdiff \| raw \| diff to current
2007-02-24	Junio C Hamano	Evil Merge branch 'jc/status' (early part) into js...	blob \| commitdiff \| raw \| diff to current
2007-02-24	Junio C Hamano	Merge branch 'js/apply'	blob \| commitdiff \| raw \| diff to current
2007-02-24	Junio C Hamano	Merge branch 'js/no-limit-boundary'	blob \| commitdiff \| raw \| diff to current
2007-02-24	Junio C Hamano	Merge branch 'js/etc-config'	blob \| commitdiff \| raw \| diff to current
2007-02-23	Junio C Hamano	Merge branches 'lt/crlf' and 'jc/apply-config'	blob \| commitdiff \| raw \| diff to current
2007-02-21	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-02-21	Junio C Hamano	Merge branch 'fk/autoconf'	blob \| commitdiff \| raw \| diff to current
2007-02-21	Junio C Hamano	Merge branch 'js/name-rev-fix'	blob \| commitdiff \| raw \| diff to current
2007-02-20	Junio C Hamano	Merge branch 'js/diff-color-check'	blob \| commitdiff \| raw \| diff to current
2007-02-20	Junio C Hamano	Merge branch 'jc/fetch-notags'	blob \| commitdiff \| raw \| diff to current
2007-02-19	Junio C Hamano	Merge branch 'ap/cvsserver'	blob \| commitdiff \| raw \| diff to current
2007-02-18	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk into maint	blob \| commitdiff \| raw \| diff to current
2007-02-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-02-16	Junio C Hamano	git-merge: minor fix for no_trivial_merge_strategies.	blob \| commitdiff \| raw \| diff to current
2007-02-14	Junio C Hamano	Merge branch 'js/reverse'	blob \| commitdiff \| raw \| diff to current
2007-02-14	Junio C Hamano	Merge branch 'jc/diff-apply-patch'	blob \| commitdiff \| raw \| diff to current
2007-02-14	Junio C Hamano	Merge branch 'jc/merge-base' (early part)	blob \| commitdiff \| raw \| diff to current
2007-02-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-02-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-02-12	Junio C Hamano	Merge git-gui	blob \| commitdiff \| raw \| diff to current
2007-02-04	Junio C Hamano	Merge branch 'master' into np/dreflog	blob \| commitdiff \| raw \| diff to current
2007-01-31	Junio C Hamano	Merge branch 'master' of git://linux-nfs.org/~bfields/git	blob \| commitdiff \| raw \| diff to current
2007-01-30	Shawn O. Pearce	Merge 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 Hamano	git-merge: leave sensible reflog message when used...	blob \| commitdiff \| raw \| diff to current
2007-01-15	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-01-15	J. Bruce Fields	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-01-14	Junio C Hamano	Merge branch 'jc/int'	blob \| commitdiff \| raw \| diff to current
2007-01-14	Junio C Hamano	Merge branch 'sp/merge' (early part)	blob \| commitdiff \| raw \| diff to current
2007-01-14	Junio C Hamano	Merge branch 'jc/subdir'	blob \| commitdiff \| raw \| diff to current
2007-01-14	Shawn O. Pearce	Merge branch 'master' into sp/fast-import	blob \| commitdiff \| raw \| diff to current
2007-01-13	Junio C Hamano	Allow whole-tree operations to be started from a subdir...	blob \| commitdiff \| raw \| diff to current
2007-01-12	Junio C Hamano	Merge branch 'jc/bare'	blob \| commitdiff \| raw \| diff to current
2007-01-10	Shawn O. Pearce	Improve merge performance by avoiding in-index merges.	blob \| commitdiff \| raw \| diff to current
2007-01-10	Shawn O. Pearce	Disallow working directory commands in a bare repository.	blob \| commitdiff \| raw \| diff to current
2007-01-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-01-07	Junio C Hamano	Merge branch 'sp/mmap'	blob \| commitdiff \| raw \| diff to current
2007-01-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-01-01	Junio C Hamano	Merge branch 'sp/merge' (early part)	blob \| commitdiff \| raw \| diff to current
2007-01-01	Junio C Hamano	fail pull/merge early in the middle of conflicted merge	blob \| commitdiff \| raw \| diff to current
2006-12-29	Junio C Hamano	Merge branch 'jc/curl'	blob \| commitdiff \| raw \| diff to current
2006-12-29	Junio C Hamano	Merge branch 'jc/utf8'	blob \| commitdiff \| raw \| diff to current
2006-12-29	Junio C Hamano	Merge branch 'jc/make'	blob \| commitdiff \| raw \| diff to current
2006-12-28	Junio C Hamano	Merge branch 'js/shallow'	blob \| commitdiff \| raw \| diff to current
2006-12-28	Shawn O. Pearce	Honor pull.{twohead,octopus} in git-merge.	blob \| commitdiff \| raw \| diff to current
2006-12-28	Shawn O. Pearce	Use GIT_REFLOG_ACTION environment variable instead.	blob \| commitdiff \| raw \| diff to current
2006-12-27	Junio C Hamano	Merge branch 'master' into js/shallow	blob \| commitdiff \| raw \| diff to current
2006-12-27	Junio C Hamano	Merge branch 'jc/fsck-reflog'	blob \| commitdiff \| raw \| diff to current
2006-12-25	Junio C Hamano	Merge branch 'jc/skip-count'	blob \| commitdiff \| raw \| diff to current
2006-12-25	Junio C Hamano	Merge branch 'jc/git-add--interactive'	blob \| commitdiff \| raw \| diff to current
2006-12-24	Junio C Hamano	Merge branch 'sb/merge-friendly'	blob \| commitdiff \| raw \| diff to current
2006-12-24	Junio C Hamano	Merge branch 'js/rerere'	blob \| commitdiff \| raw \| diff to current
2006-12-23	Shawn O. Pearce	Display 'theirs' branch name when possible in merge.	blob \| commitdiff \| raw \| diff to current
2006-12-22	Junio C Hamano	merge and reset: adjust for "reset --hard" messages	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom