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

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

2007-10-21	Merge branch 'maint'	blob \| diff \| raw
2007-10-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2007-10-21	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-10-19	Merge branch 'maint'	blob \| diff \| raw
2007-10-19	Merge branch 'maint'	blob \| diff \| raw
2007-10-18	Merge branch 'jc/am-quiet'	blob \| diff \| raw
2007-10-18	Merge branch 'maint'	blob \| diff \| raw
2007-10-18	Merge branch 'lt/diff-rename'	blob \| diff \| raw
2007-10-17	Merge branch 'maint'	blob \| diff \| raw
2007-10-16	Merge branch 'master' into db/fetch-pack	blob \| diff \| raw
2007-10-16	Merge branch 'maint'	blob \| diff \| raw
2007-10-03	Merge branch 'mv/unknown'	blob \| diff \| raw
2007-10-03	Merge branch 'ph/strbuf'	blob \| diff \| raw
2007-10-03	Merge branch 'lh/merge'	blob \| diff \| raw
2007-10-03	Merge branch 'js/rebase-i'	blob \| diff \| raw \| diff to current
2007-10-03	Merge branch 'jc/autogc'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'gr/smtp'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'ss/svnimport'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'sv/svn'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'ml/submodule'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'jb/remote-rm'	blob \| diff \| raw \| diff to current
2007-09-29	Merge branch 'jk/diff-rename'	blob \| diff \| raw \| diff to current
2007-09-29	Sync with GIT 1.5.3.3	blob \| diff \| raw \| diff to current
2007-09-26	Fix spelling of overridden in documentation	blob \| diff \| raw \| diff to current
2007-09-24	git-merge: add support for branch.<name>.mergeoptions	blob \| diff \| raw \| diff to current
2007-09-18	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-08-29	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-08-27	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-08-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-08-21	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-08-19	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-08-19	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-08-16	Merge branch 'maint' to sync with 1.5.2.5	blob \| diff \| raw \| diff to current
2007-08-13	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-08-11	Merge branch 'cr/tag'	blob \| diff \| raw \| diff to current
2007-08-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-08-05	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-08-02	Try to be consistent with capitalization in the documen...	blob \| diff \| raw \| diff to current
2007-08-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-30	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-07-28	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-07-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-15	Merge branch 'master' of git://repo.or.cz/git/fastimport	blob \| diff \| raw \| diff to current
2007-07-14	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-07-13	Update git-merge documentation.	blob \| diff \| raw \| diff to current
2007-07-12	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-07-12	Merge commit 'git-gui/master'	blob \| diff \| raw \| diff to current
2007-07-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-12	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-07-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-07-02	Merge 1.5.2.3 in	blob \| diff \| raw \| diff to current
2007-07-01	Merge branch 'ml/worktree'	blob \| diff \| raw \| diff to current
2007-07-01	Merge branch 'ei/worktree+filter'	blob \| diff \| raw \| diff to current
2007-06-30	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-29	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-06-29	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-06-28	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-06-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-26	Merge branch 'master' of git://git./gitk/gitk into...	blob \| diff \| raw \| diff to current
2007-06-23	Merge branch 'js/filter'	blob \| diff \| raw \| diff to current
2007-06-22	Import branch 'git-p4' of git://repo.or.cz/fast-export	blob \| diff \| raw \| diff to current
2007-06-16	Merge branch 'maint' to sync with GIT 1.5.2.2	blob \| diff \| raw \| diff to current
2007-06-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-13	Merge branch 'aw/cvs'	blob \| diff \| raw \| diff to current
2007-06-13	Merge branch 'ep/cvstag'	blob \| diff \| raw \| diff to current
2007-06-12	Merge branch 'lh/submodule'	blob \| diff \| raw \| diff to current
2007-06-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-12	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-06-12	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-06-11	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-06-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-11	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-06-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-09	Merge branch 'aj/pack'	blob \| diff \| raw \| diff to current
2007-06-09	Merge branch 'js/merge'	blob \| diff \| raw \| diff to current
2007-06-09	Merge branch 'ar/clone'	blob \| diff \| raw \| diff to current
2007-06-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-06-07	War on whitespace	blob \| diff \| raw \| diff to current
2007-06-06	Merge branch 'sv/objfixes'	blob \| diff \| raw \| diff to current
2007-06-03	Merge branch 'maint' to sync with 1.5.2.1	blob \| diff \| raw \| diff to current
2007-06-03	Merge branches 'lh/submodules' and 'pb/am'	blob \| diff \| raw \| diff to current
2007-06-02	Merge branch 'sp/pack'	blob \| diff \| raw \| diff to current
2007-06-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'db/remote'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'dh/repack' (early part)	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'np/delta'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'jc/nodelta'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'ar/verbose'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'ar/run'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'ar/mergestat'	blob \| diff \| raw \| diff to current
2007-05-29	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2007-05-25	Add a configuration option to control diffstat after...	blob \| diff \| raw \| diff to current
next