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-02-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-02-13	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2007-02-12	Junio C Hamano	Merge git-gui	blob \| commitdiff \| raw
2007-02-04	Junio C Hamano	Merge branch 'master' into np/dreflog	blob \| commitdiff \| raw
2007-01-31	Junio C Hamano	Merge branch 'master' of git://linux-nfs.org/~bfields/git	blob \| commitdiff \| raw
2007-01-30	Shawn O. Pearce	Merge branch 'master' into sp/gfi	blob \| commitdiff \| raw
2007-01-29	Tom Prince	[PATCH] Rename git-repo-config to git-config.	blob \| commitdiff \| raw
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
2006-12-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-21	Junio C Hamano	Merge branch 'ew/svn-pm'	blob \| commitdiff \| raw \| diff to current
2006-12-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-18	Junio C Hamano	Merge branch 'jc/blame-boundary'	blob \| commitdiff \| raw \| diff to current
2006-12-18	Junio C Hamano	Merge branch 'jn/web' (early part)	blob \| commitdiff \| raw \| diff to current
2006-12-16	Junio C Hamano	merge: give a bit prettier merge message to "merge...	blob \| commitdiff \| raw \| diff to current
2006-12-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-14	Junio C Hamano	Merge branch 'jc/diff--cached'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'jc/read-tree-ignore'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'ew/rerere'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'np/addcommit'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'lh/branch-rename'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'jc/commit-careful'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'ap/clone-origin'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'jc/numstat'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'rr/cvsexportcommit'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'ap/branch'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'js/merge'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	git merge: reword failure message.	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'master' into js/merge	blob \| commitdiff \| raw \| diff to current
2006-12-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-06	Junio C Hamano	git-merge: fix "fix confusion between tag and branch...	blob \| commitdiff \| raw \| diff to current
2006-12-06	Junio C Hamano	git-merge: squelch needless error message.	blob \| commitdiff \| raw \| diff to current
2006-12-06	Junio C Hamano	Merge	blob \| commitdiff \| raw \| diff to current
2006-12-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-06	Junio C Hamano	Loosen "working file will be lost" check in Porcelain-ish	blob \| commitdiff \| raw \| diff to current
2006-12-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-03	Junio C Hamano	git-merge: fix confusion between tag and branch	blob \| commitdiff \| raw \| diff to current
2006-11-29	Junio C Hamano	Merge master.kernel.org:/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-11-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-29	Junio C Hamano	Merge branch 'jc/globfetch'	blob \| commitdiff \| raw \| diff to current
2006-11-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-27	Junio C Hamano	Merge branch 'js/shortlog'	blob \| commitdiff \| raw \| diff to current
2006-11-27	Junio C Hamano	Merge branch 'jc/push-delete-ref'	blob \| commitdiff \| raw \| diff to current
2006-11-27	Junio C Hamano	Merge branch 'jc/merge'	blob \| commitdiff \| raw \| diff to current
2006-11-27	Junio C Hamano	git-merge: do not leak rev-parse output used for checki...	blob \| commitdiff \| raw \| diff to current
2006-11-27	Junio C Hamano	git-merge: tighten error checking.	blob \| commitdiff \| raw \| diff to current
2006-11-24	Junio C Hamano	Merge branch 'jc/upload-pack'	blob \| commitdiff \| raw \| diff to current
2006-11-22	Junio C Hamano	merge: allow merging into a yet-to-be-born branch.	blob \| commitdiff \| raw \| diff to current
2006-11-22	Junio C Hamano	git-merge: make it usable as the first class UI	blob \| commitdiff \| raw \| diff to current
2006-11-22	Junio C Hamano	remove merge-recursive-old	blob \| commitdiff \| raw \| diff to current
2006-11-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-08	Junio C Hamano	Merge branch 'jc/pickaxe'	blob \| commitdiff \| raw \| diff to current
2006-11-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-05	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-11-01	Junio C Hamano	Merge branch 'jc/refs-and-fetch'	blob \| commitdiff \| raw \| diff to current
2006-11-01	Junio C Hamano	Merge branch 'lj/refs'	blob \| commitdiff \| raw \| diff to current
2006-10-31	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-10-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-10-26	Junio C Hamano	Merge branch 'jc/combined'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom