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

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

2008-10-09	Merge branch 'maint'	blob \| diff \| raw
2008-10-08	Merge branch 'maint'	blob \| diff \| raw
2008-10-06	Merge branch 'maint'	blob \| diff \| raw
2008-10-03	Merge branch 'maint'	blob \| diff \| raw
2008-10-01	Merge branch 'maint'	blob \| diff \| raw
2008-09-30	Merge branch 'maint'	blob \| diff \| raw
2008-09-29	Merge branch 'bc/master-diff-hunk-header-fix'	blob \| diff \| raw
2008-09-29	Merge branch 'maint' into bc/master-diff-hunk-header-fix	blob \| diff \| raw \| diff to current
2008-09-29	Merge branch 'jc/better-conflict-resolution'	blob \| diff \| raw
2008-09-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'jc/safe-c-l-d'	blob \| diff \| raw \| diff to current
2008-09-25	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-09-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-23	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-22	Merge branch 'db/maint-checkout-b'	blob \| diff \| raw \| diff to current
2008-09-21	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-20	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-20	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'jc/diff-prefix'	blob \| diff \| raw \| diff to current
2008-09-19	Merge branch 'tr/rev-list-reverse'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'dp/maint-rebase-fix'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-checkout-keep-remove'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-diff-quiet'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-name-hash-clear'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'jc/maint-template-permbits'	blob \| diff \| raw \| diff to current
2008-09-16	Merge branch 'mh/maint-honor-no-ssl-verify'	blob \| diff \| raw \| diff to current
2008-09-13	Sync with 1.6.0.2	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-10	Merge branch 'ho/dashless'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/cc-ld-dynpath'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/hide-cr-in-diff-from-less'	blob \| diff \| raw \| diff to current
2008-09-08	Merge branch 'jc/maint-checkout-fix'	blob \| diff \| raw \| diff to current
2008-09-07	Merge updated git-gui and gitk that call each other	blob \| diff \| raw \| diff to current
2008-09-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-06	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-09-05	Merge branch 'jc/maint-log-grep'	blob \| diff \| raw \| diff to current
2008-09-04	Fix AsciiDoc errors in merge documentation	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'tr/filter-branch'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'np/maint-safer-pack'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'jc/author-nickname'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-09-03	Merge branch 'np/maint-safer-pack' into np/pack	blob \| diff \| raw \| diff to current
2008-09-01	git-merge documentation: describe how conflict is presented	blob \| diff \| raw \| diff to current
2008-08-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-30	Merge branch 'sb/daemon'	blob \| diff \| raw \| diff to current
2008-08-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-28	Merge branch 'mv/merge-custom'	blob \| diff \| raw \| diff to current
2008-08-28	Merge branch 'ml/submodule'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'am/cherry-pick-rerere'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'jc/add-addremove'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'np/verify-pack'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'af/maint-install-no-handlink'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'jc/no-slim-shell'	blob \| diff \| raw \| diff to current
2008-08-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-24	Merge branch 'jc/no-slim-shell'	blob \| diff \| raw \| diff to current
2008-08-24	Merge branch 'maint' to sync with 1.6.0.1	blob \| diff \| raw \| diff to current
2008-08-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-23	git-merge documentation: more details about resolving...	blob \| diff \| raw \| diff to current
2008-08-21	Merge branch 'cc/merge-base-many'	blob \| diff \| raw \| diff to current
2008-08-20	Merge branch 'ph/enable-threaded'	blob \| diff \| raw \| diff to current
2008-08-20	Merge branch 'jk/pager-swap'	blob \| diff \| raw \| diff to current
2008-08-20	Merge branch 'rs/imap'	blob \| diff \| raw \| diff to current
2008-08-17	Merge git-gui 0.11.0	blob \| diff \| raw \| diff to current
2008-08-17	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-08-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-07	Merge branch 'lt/config-fsync' into maint	blob \| diff \| raw \| diff to current
2008-08-07	Merge branch 'jc/reflog-expire' into maint	blob \| diff \| raw \| diff to current
2008-08-07	Merge branch 'ag/rewrite_one' into maint	blob \| diff \| raw \| diff to current
2008-08-06	Sync with 1.5.6.5	blob \| diff \| raw \| diff to current
2008-08-06	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-08-06	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-08-06	Merge branch 'rs/archive-parse-options'	blob \| diff \| raw \| diff to current
2008-08-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-08-02	Update my e-mail address	blob \| diff \| raw \| diff to current
2008-07-31	Make the DESCRIPTION match <x>... items in the SYNOPSIS	blob \| diff \| raw \| diff to current
2008-07-30	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-07-27	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-07-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-07-24	Merge branch 'maint' into ph/checkout	blob \| diff \| raw \| diff to current
2008-07-21	Update my e-mail address	blob \| diff \| raw \| diff to current
2008-07-21	Merge branch 'ap/trackinfo' v1.6.0-rc0	blob \| diff \| raw \| diff to current
2008-07-21	Merge branch 'jc/rerere-auto-more'	blob \| diff \| raw \| diff to current
2008-07-21	Merge branch 'ns/am-abort'	blob \| diff \| raw \| diff to current
2008-07-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
next