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

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

projects / thirdparty / git.git / history

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

2007-06-07	Junio C Hamano	War on whitespace	blob \| commitdiff \| raw
2007-06-06	Junio C Hamano	Merge branch 'sv/objfixes'	blob \| commitdiff \| raw \| diff to current
2007-06-03	Junio C Hamano	Merge branch 'maint' to sync with 1.5.2.1	blob \| commitdiff \| raw \| diff to current
2007-06-03	Junio C Hamano	Merge branches 'lh/submodules' and 'pb/am'	blob \| commitdiff \| raw \| diff to current
2007-06-02	Junio C Hamano	Merge branch 'sp/pack'	blob \| commitdiff \| raw \| diff to current
2007-06-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-05-31	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'db/remote'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'dh/repack' (early part)	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'np/delta'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'jc/nodelta'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'ar/verbose'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'ar/run'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'ar/mergestat'	blob \| commitdiff \| raw \| diff to current
2007-05-29	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-05-25	Alex Riesen	Add a configuration option to control diffstat after...	blob \| commitdiff \| raw \| diff to current
2007-05-17	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-05-10	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-05-08	Shawn O. Pearce	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-05-07	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-05-07	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-05-07	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk into...	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-04-18	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-04-15	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk into...	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-20	Junio C Hamano	Merge git://git2.kernel.org/pub/scm/gitk/gitk	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-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-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 branch 'maint'	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-17	Shawn O. Pearce	Convert update-index references in docs to add.	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	Matthias Lederhofer	git merge documentation: -m is optional	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-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-18	Junio C Hamano	Documentation: sync git.txt command list and manual...	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-14	Shawn O. Pearce	Merge branch 'master' into sp/fast-import	blob \| commitdiff \| raw \| diff to current
2007-01-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-01-05	Junio C Hamano	Merge branch 'maint'	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	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-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2006-12-14	Junio C Hamano	Merge branch 'maint'	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 'maint'	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	Merge branch 'maint'	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-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-22	Junio C Hamano	git-merge: make it usable as the first class UI	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-09-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	Merge branch 'jc/upload-pack'	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	Merge branch 'th/diff-extra'	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	GIT 1.4.2 v1.4.2	blob \| commitdiff \| raw \| diff to current
2006-08-13	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2006-08-08	Junio C Hamano	Merge branch 'master' into pb/gitpm	blob \| commitdiff \| raw \| diff to current
2006-07-30	Junio C Hamano	Merge branch 'jn/make'	blob \| commitdiff \| raw \| diff to current
2006-07-26	Junio C Hamano	Merge branch 'pb/configure'	blob \| commitdiff \| raw \| diff to current
2006-07-13	Junio C Hamano	Merge branch 'ml/trace'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom