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

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

2008-05-14	Merge branch 'maint'	blob \| diff \| raw
2008-05-14	Merge branch 'sb/committer'	blob \| diff \| raw
2008-05-14	Merge branch 'bd/tests'	blob \| diff \| raw
2008-05-14	Merge branch 'mv/format-cc'	blob \| diff \| raw
2008-05-14	Merge branch 'cc/hooks-doc'	blob \| diff \| raw
2008-05-12	Merge branch 'gp/bisect-fix'	blob \| diff \| raw
2008-05-11	Merge branch 'maint'	blob \| diff \| raw
2008-05-11	Merge branch 'py/diff-submodule'	blob \| diff \| raw
2008-05-11	Merge branch 'lt/case-insensitive'	blob \| diff \| raw
2008-05-09	Merge branch 'maint'	blob \| diff \| raw
2008-05-09	Merge branch 'sg/merge-options' (early part)	blob \| diff \| raw
2008-05-03	Merge commit 'sg/merge-options^' into jk/renamelimit	blob \| diff \| raw
2008-04-13	merge, pull: add '--(no-)log' command line option	blob \| diff \| raw
2008-04-13	add 'merge.stat' config variable	blob \| diff \| raw \| diff to current
2008-04-13	merge, pull: introduce '--(no-)stat' option	blob \| diff \| raw \| diff to current
2008-04-08	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-04-05	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-04-02	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-03-16	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-03-15	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-03-12	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-03-06	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-03-01	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-03-01	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-02-23	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-02-17	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-02-17	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-02-13	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-02-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-01-24	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-01-21	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-01-21	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-01-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-01-11	Merge ../gitk	blob \| diff \| raw \| diff to current
2008-01-09	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2008-01-08	Merge in GIT 1.5.3.8	blob \| diff \| raw \| diff to current
2008-01-05	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-12-31	Merge branch 'maint' of git://linux-nfs.org/~bfields/git	blob \| diff \| raw \| diff to current
2007-12-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-07	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-12-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-01	Merge 1.5.3.7 in	blob \| diff \| raw \| diff to current
2007-12-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-21	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-11-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-18	Merge branch 'maint' to synchronize with 1.5.3.6	blob \| diff \| raw \| diff to current
2007-11-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'bs/maint-commit-options'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'rv/maint-index-commit'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'bs/maint-t7005'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'jc/maint-add-sync-stat'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'jc/stash-create'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-12	Merge branch 'sp/maint-plug-traverse-commit-list-leak...	blob \| diff \| raw \| diff to current
2007-11-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-08	Merge branch 'jc/clean-config'	blob \| diff \| raw \| diff to current
2007-11-08	Merge branch 'ds/maint-deflatebound'	blob \| diff \| raw \| diff to current
2007-11-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-02	Merge branch 'gp/maint-diffdoc'	blob \| diff \| raw \| diff to current
2007-11-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-01	Merge branch 'bk/maint-cvsexportcommit'	blob \| diff \| raw \| diff to current
2007-11-01	Merge branch 'kh/commit'	blob \| diff \| raw \| diff to current
2007-10-31	Merge branch 'maint' to catch up with 1.5.3.5	blob \| diff \| raw \| diff to current
2007-10-31	Merge branch 'maint' into HEAD	blob \| diff \| raw \| diff to current
2007-10-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-28	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2007-10-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
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 \| diff to current
2007-10-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-18	Merge branch 'jc/am-quiet'	blob \| diff \| raw \| diff to current
2007-10-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-18	Merge branch 'lt/diff-rename'	blob \| diff \| raw \| diff to current
2007-10-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-16	Merge branch 'master' into db/fetch-pack	blob \| diff \| raw \| diff to current
2007-10-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-10-03	Merge branch 'mv/unknown'	blob \| diff \| raw \| diff to current
2007-10-03	Merge branch 'ph/strbuf'	blob \| diff \| raw \| diff to current
2007-10-03	Merge branch 'lh/merge'	blob \| diff \| raw \| diff to current
2007-09-24	git-merge: add --ff and --no-ff options	blob \| diff \| raw \| diff to current
2007-09-24	git-merge: add support for --commit and --no-squash	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
next