Andrew's git - gitweb.git/history - Documentation/git-merge.txt

[gitweb.git] / Documentation / git-merge.txt

2007-05-10	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2007-05-08	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2007-05-07	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2007-05-07	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw
2007-05-07	Merge git://git2./pub/scm/gitk/gitk into maint	blob \| diff \| raw
2007-04-18	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2007-04-18	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw
2007-04-15	Merge git://git2./pub/scm/gitk/gitk into maint	blob \| diff \| raw
2007-03-22	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2007-03-20	Merge git://git2.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2007-03-13	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2007-03-12	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw
2007-03-06	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| diff \| raw
2007-03-05	Merge branch 'js/fetch-progress' (early part)	blob \| diff \| raw
2007-03-02	Merge branch 'js/commit-format'	blob \| diff \| raw
2007-02-28	Merge branch 'js/bundle'	blob \| diff \| raw
2007-02-28	Merge branch 'mc/sendmail'	blob \| diff \| raw
2007-02-27	Merge branch 'np/types' into jc/fetch	blob \| diff \| raw
2007-02-26	Merge branch 'jc/merge-symlink' into maint	blob \| diff \| raw
2007-02-25	Merge git://repo.or.cz/git-gui into maint	blob \| diff \| raw
2007-02-24	Evil Merge branch 'jc/status' (early part) into js...	blob \| diff \| raw
2007-02-24	Merge branch 'js/apply'	blob \| diff \| raw
2007-02-24	Merge branch 'js/no-limit-boundary'	blob \| diff \| raw
2007-02-24	Merge branch 'js/etc-config'	blob \| diff \| raw
2007-02-23	Merge branches 'lt/crlf' and 'jc/apply-config'	blob \| diff \| raw
2007-02-21	Merge branch 'master' of git://repo.or.cz/git-gui into...	blob \| diff \| raw
2007-02-21	Merge branch 'fk/autoconf'	blob \| diff \| raw
2007-02-21	Merge branch 'js/name-rev-fix'	blob \| diff \| raw
2007-02-20	Merge branch 'js/diff-color-check'	blob \| diff \| raw
2007-02-20	Merge branch 'jc/fetch-notags'	blob \| diff \| raw
2007-02-19	Merge branch 'ap/cvsserver'	blob \| diff \| raw
2007-02-18	Merge branch 'maint'	blob \| diff \| raw
2007-02-18	Merge git://git./pub/scm/gitk/gitk into maint	blob \| diff \| raw
2007-02-17	Convert update-index references in docs to add.	blob \| diff \| raw
2007-02-14	Merge branch 'js/reverse'	blob \| diff \| raw \| diff to current
2007-02-14	Merge branch 'jc/diff-apply-patch'	blob \| diff \| raw \| diff to current
2007-02-14	Merge branch 'jc/merge-base' (early part)	blob \| diff \| raw \| diff to current
2007-02-13	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-02-13	git merge documentation: -m is optional	blob \| diff \| raw \| diff to current
2007-02-13	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-02-12	Merge git-gui	blob \| diff \| raw \| diff to current
2007-01-31	Merge branch 'master' of git://linux-nfs.org/~bfields/git	blob \| diff \| raw \| diff to current
2007-01-30	Merge branch 'master' into sp/gfi	blob \| diff \| raw \| diff to current
2007-01-18	Documentation: sync git.txt command list and manual...	blob \| diff \| raw \| diff to current
2007-01-15	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2007-01-14	Merge branch 'master' into sp/fast-import	blob \| diff \| raw \| diff to current
2007-01-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-01-05	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-29	Merge branch 'jc/curl'	blob \| diff \| raw \| diff to current
2006-12-29	Merge branch 'jc/utf8'	blob \| diff \| raw \| diff to current
2006-12-29	Merge branch 'jc/make'	blob \| diff \| raw \| diff to current
2006-12-28	Merge branch 'js/shallow'	blob \| diff \| raw \| diff to current
2006-12-28	Use GIT_REFLOG_ACTION environment variable instead.	blob \| diff \| raw \| diff to current
2006-12-27	Merge branch 'master' into js/shallow	blob \| diff \| raw \| diff to current
2006-12-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-13	Merge branch 'jc/commit-careful'	blob \| diff \| raw \| diff to current
2006-12-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-05	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-12-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-11-29	Merge master.kernel.org:/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-11-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-11-29	Merge branch 'jc/globfetch'	blob \| diff \| raw \| diff to current
2006-11-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-11-27	Merge branch 'js/shortlog'	blob \| diff \| raw \| diff to current
2006-11-27	Merge branch 'jc/push-delete-ref'	blob \| diff \| raw \| diff to current
2006-11-27	Merge branch 'jc/merge'	blob \| diff \| raw \| diff to current
2006-11-22	git-merge: make it usable as the first class UI	blob \| diff \| raw \| diff to current
2006-11-08	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-09-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-08-13	Merge branch 'jc/upload-pack'	blob \| diff \| raw \| diff to current
2006-08-13	Merge branch 'th/diff-extra'	blob \| diff \| raw \| diff to current
2006-08-13	GIT 1.4.2 v1.4.2	blob \| diff \| raw \| diff to current
2006-08-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-08-08	Merge branch 'master' into pb/gitpm	blob \| diff \| raw \| diff to current
2006-07-30	Merge branch 'jn/make'	blob \| diff \| raw \| diff to current
2006-07-26	Merge branch 'pb/configure'	blob \| diff \| raw \| diff to current
2006-07-13	Merge branch 'ml/trace'	blob \| diff \| raw \| diff to current
2006-07-13	Merge branch 'lt/prune'	blob \| diff \| raw \| diff to current
2006-07-13	Merge branch 'lt/merge-tree'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'jc/show-merge'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'lt/gitweb'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'jc/rename'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'jc/grep'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'jc/mailinfo'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'ew/diff'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'ew/svn'	blob \| diff \| raw \| diff to current
2006-07-09	Assorted typo fixes	blob \| diff \| raw \| diff to current
2006-06-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-06-10	Merge git://git.kernel.org/pub/scm/git/gitweb	blob \| diff \| raw \| diff to current
2006-06-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-06-04	Merge branch 'new' of git://git./gitk/gitk into next	blob \| diff \| raw \| diff to current
2006-06-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-05-03	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-24	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
next