Code

Merge branch 'maint-1.5.4' into maint
[git.git] / Documentation / git-merge.txt
2008-04-08 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-05 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-04-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-03-16 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Junio C HamanoMerge branch 'py/submodule'
2008-03-15 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-12 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-03-12 Junio C HamanoMerge branch 'js/remote'
2008-03-11 Junio C HamanoMerge branch 'jc/cherry-pick' (early part)
2008-03-09 Junio C HamanoMerge branch 'ph/parseopt'
2008-03-09 Junio C HamanoMerge branch 'sp/fetch-optim'
2008-03-09 Junio C HamanoMerge branch 'jc/describe-always'
2008-03-08 Junio C HamanoMerge branch 'mh/maint-http-proxy-fix' into maint
2008-03-08 Junio C HamanoMerge branch 'js/maint-daemon' into maint
2008-03-08 Junio C HamanoMerge branch 'js/maint-cvsexport' into maint
2008-03-08 Junio C HamanoMerge branch 'jc/maint-log-merge-left-right' into maint
2008-03-08 Junio C HamanoMerge branch 'ew/maint-svn-cert-fileprovider' into...
2008-03-08 Junio C HamanoMerge branch 'js/reflog-delete'
2008-03-06 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-04 Junio C HamanoMerge branch 'maint'
2008-03-03 Matthieu MoyFix incorrect wording in git-merge.txt.
2008-03-01 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2008-03-01 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Junio C HamanoMerge branch 'bc/reflog-fix' into js/reflog-delete
2008-02-17 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-02-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-13 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-02-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-12 Junio C HamanoMerge branch 'ph/describe-match'
2008-01-24 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-16 Dave PeticolasDocumentation: fix and clarify grammar in git-merge...
2008-01-11 Junio C HamanoMerge ../gitk
2008-01-09 Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2008-01-08 Junio C HamanoMerge in GIT 1.5.3.8
2008-01-07 Dan McGeeDocumentation: rename gitlink macro to linkgit
2008-01-05 Junio C HamanoMerge git://repo.or.cz/git-gui
2007-12-31 Junio C HamanoMerge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-27 Junio C HamanoMerge branch 'rs/pretty-safety'
2007-12-27 Junio C HamanoMerge branch 'ar/commit-cleanup'
2007-12-23 Junio C HamanoDocumentation: describe 'union' low-level merge driver
2007-12-18 Junio C HamanoMerge branch 'maint'
2007-12-09 Junio C HamanoMerge branch 'maint'
2007-12-07 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-12-07 Junio C HamanoMerge branch 'maint'
2007-12-06 Junio C HamanoMerge branch 'maint'
2007-12-02 Junio C HamanoMerge branch 'maint'
2007-12-01 Junio C HamanoMerge 1.5.3.7 in
2007-12-01 Junio C HamanoMerge branch 'maint'
2007-11-29 Junio C HamanoMerge branch 'maint'
2007-11-26 Junio C HamanoMerge branch 'maint'
2007-11-25 Junio C HamanoMerge branch 'maint'
2007-11-23 Junio C HamanoMerge branch 'maint'
2007-11-23 Junio C HamanoMerge branch 'maint'
2007-11-21 Junio C HamanoMerge git://repo.or.cz/git-gui
2007-11-21 Junio C HamanoMerge branch 'maint'
2007-11-19 Junio C HamanoMerge branch 'maint'
2007-11-18 Junio C HamanoMerge branch 'maint' to synchronize with 1.5.3.6
2007-11-17 Junio C HamanoMerge branch 'maint'
2007-11-14 Junio C HamanoMerge branch 'bs/maint-commit-options'
2007-11-14 Junio C HamanoMerge branch 'rv/maint-index-commit'
2007-11-14 Junio C HamanoMerge branch 'bs/maint-t7005'
2007-11-14 Junio C HamanoMerge branch 'jc/maint-add-sync-stat'
2007-11-14 Junio C HamanoMerge branch 'jc/stash-create'
2007-11-14 Junio C HamanoMerge branch 'maint'
2007-11-12 Junio C HamanoMerge branch 'maint'
2007-11-12 Junio C HamanoMerge branch 'sp/maint-plug-traverse-commit-list-leak...
2007-11-11 Junio C HamanoMerge branch 'maint'
2007-11-10 Junio C HamanoMerge branch 'maint'
2007-11-09 Junio C HamanoMerge branch 'maint'
2007-11-08 Junio C HamanoMerge branch 'jc/clean-config'
2007-11-08 Junio C HamanoMerge branch 'ds/maint-deflatebound'
2007-11-08 Junio C HamanoMerge branch 'maint'
2007-11-06 Junio C HamanoMerge branch 'maint'
2007-11-04 Junio C HamanoMerge branch 'jc/revert-merge'
2007-11-04 Junio C HamanoMerge branch 'maint'
2007-11-02 Junio C HamanoMerge branch 'maint'
2007-11-02 Junio C HamanoMerge branch 'ph/parseopt'
2007-11-02 Junio C HamanoMerge branch 'np/progress'
2007-11-02 Junio C HamanoMerge branch 'gp/maint-diffdoc'
2007-11-02 Junio C HamanoMerge branch 'maint'
2007-11-01 Junio C HamanoMerge branch 'bk/maint-cvsexportcommit'
2007-11-01 Junio C HamanoMerge branch 'js/forkexec'
2007-11-01 Junio C HamanoMerge branch 'sp/mergetool'
2007-11-01 Junio C HamanoMerge branch 'sp/help'
2007-11-01 Junio C HamanoMerge branch 'kh/commit'
2007-10-31 Junio C HamanoMerge branch 'maint' to catch up with 1.5.3.5
2007-10-31 Junio C HamanoMerge branch 'maint' into HEAD
2007-10-30 Junio C Hamanogit-merge: document but discourage the historical syntax
2007-10-29 Junio C HamanoMerge branch 'maint'
2007-10-28 Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-10-27 Junio C HamanoMerge branch 'maint'
2007-10-21 Shawn O. PearceMerge branch 'maint'
2007-10-21 Shawn O. PearceMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-10-21 Shawn O. PearceMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-10-19 Shawn O. PearceMerge branch 'maint'
2007-10-19 Shawn O. PearceMerge branch 'maint'
next