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

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

2008-06-22	Merge branch 'lt/racy-empty'	blob \| diff \| raw
2008-06-22	Merge branch 'jc/maint-combine-diff-pre-context'	blob \| diff \| raw
2008-06-22	Merge branch 'kh/update-ref'	blob \| diff \| raw
2008-06-17	Merge branch 'maint'	blob \| diff \| raw
2008-06-16	Merge branch 'maint'	blob \| diff \| raw
2008-06-11	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2008-06-11	Merge branch 'maint'	blob \| diff \| raw
2008-06-09	Merge branch 'js/merge-recursive'	blob \| diff \| raw
2008-06-09	Merge branch 'maint'	blob \| diff \| raw
2008-06-07	Merge 1.5.5.4 in	blob \| diff \| raw
2008-06-06	documentation: move git(7) to git(1)	blob \| diff \| raw
2008-06-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-28	Merge 1.5.5.3 in	blob \| diff \| raw \| diff to current
2008-05-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-27	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-05-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'db/clone-in-c'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'ar/batch-cat'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'ap/svn'	blob \| diff \| raw \| diff to current
2008-05-24	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'pb/push'	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'sv/first-parent'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'np/pack'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'as/graph'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'jk/maint-send-email-compose'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'hb/maint-send-email-quote-recipients'	blob \| diff \| raw \| diff to current
2008-05-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-05-15	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'sb/committer'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'bd/tests'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'mv/format-cc'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'cc/hooks-doc'	blob \| diff \| raw \| diff to current
2008-05-12	Merge branch 'gp/bisect-fix'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'py/diff-submodule'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'lt/case-insensitive'	blob \| diff \| raw \| diff to current
2008-05-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-09	Merge branch 'sg/merge-options' (early part)	blob \| diff \| raw \| diff to current
2008-05-03	Merge commit 'sg/merge-options^' into jk/renamelimit	blob \| diff \| raw \| diff to current
2008-04-13	merge, pull: introduce '--(no-)stat' option	blob \| diff \| raw \| diff to current
2008-04-13	doc: moved merge.* config variables into separate merge...	blob \| diff \| raw \| diff to current
2008-04-09	Merge branch 'jc/rename'	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 branch 'py/submodule'	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-12	Merge branch 'js/remote'	blob \| diff \| raw \| diff to current
2008-03-11	Merge branch 'jc/cherry-pick' (early part)	blob \| diff \| raw \| diff to current
2008-03-09	Merge branch 'ph/parseopt'	blob \| diff \| raw \| diff to current
2008-03-09	Merge branch 'sp/fetch-optim'	blob \| diff \| raw \| diff to current
2008-03-09	Merge branch 'jc/describe-always'	blob \| diff \| raw \| diff to current
2008-03-08	Merge branch 'mh/maint-http-proxy-fix' into maint	blob \| diff \| raw \| diff to current
2008-03-08	Merge branch 'js/maint-daemon' into maint	blob \| diff \| raw \| diff to current
2008-03-08	Merge branch 'js/maint-cvsexport' into maint	blob \| diff \| raw \| diff to current
2008-03-08	Merge branch 'jc/maint-log-merge-left-right' into maint	blob \| diff \| raw \| diff to current
2008-03-08	Merge branch 'ew/maint-svn-cert-fileprovider' into...	blob \| diff \| raw \| diff to current
2008-03-08	Merge branch 'js/reflog-delete'	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-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-03-03	Fix incorrect wording in git-merge.txt.	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-23	Merge branch 'bc/reflog-fix' into js/reflog-delete	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-02-12	Merge branch 'ph/describe-match'	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-16	Documentation: fix and clarify grammar in git-merge...	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-07	Documentation: rename gitlink macro to linkgit	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-27	Merge branch 'rs/pretty-safety'	blob \| diff \| raw \| diff to current
2007-12-27	Merge branch 'ar/commit-cleanup'	blob \| diff \| raw \| diff to current
2007-12-23	Documentation: describe 'union' low-level merge driver	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
next