projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix incorrect wording in git-merge.txt.
[git] / Documentation / git-merge.txt
2008-03-03  Matthieu MoyFix incorrect wording in git-merge.txt. blob | commitdiff | raw
2008-03-01  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2008-02-23  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2008-01-24  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2008-01-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2008-01-16  Dave PeticolasDocumentation: fix and clarify grammar in git-merge... blob | commitdiff | raw | diff to current
2008-01-11  Junio C HamanoMerge ../gitk blob | commitdiff | raw | diff to current
2008-01-09  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2008-01-08  Junio C HamanoMerge in GIT 1.5.3.8 blob | commitdiff | raw | diff to current
2008-01-07  Dan McGeeDocumentation: rename gitlink macro to linkgit blob | commitdiff | raw | diff to current
2008-01-05  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-12-31  Junio C HamanoMerge branch 'maint' of git://linux-nfs.org/~bfields/git blob | commitdiff | raw | diff to current
2007-12-27  Junio C HamanoMerge branch 'rs/pretty-safety' blob | commitdiff | raw | diff to current
2007-12-27  Junio C HamanoMerge branch 'ar/commit-cleanup' blob | commitdiff | raw | diff to current
2007-12-23  Junio C HamanoDocumentation: describe 'union' low-level merge driver blob | commitdiff | raw | diff to current
2007-12-18  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-12-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-12-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-12-07  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-12-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-12-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-12-01  Junio C HamanoMerge 1.5.3.7 in blob | commitdiff | raw | diff to current
2007-12-01  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-29  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-26  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-25  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-23  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-23  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-21  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-11-21  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-19  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-18  Junio C HamanoMerge branch 'maint' to synchronize with 1.5.3.6 blob | commitdiff | raw | diff to current
2007-11-17  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-14  Junio C HamanoMerge branch 'bs/maint-commit-options' blob | commitdiff | raw | diff to current
2007-11-14  Junio C HamanoMerge branch 'rv/maint-index-commit' blob | commitdiff | raw | diff to current
2007-11-14  Junio C HamanoMerge branch 'bs/maint-t7005' blob | commitdiff | raw | diff to current
2007-11-14  Junio C HamanoMerge branch 'jc/maint-add-sync-stat' blob | commitdiff | raw | diff to current
2007-11-14  Junio C HamanoMerge branch 'jc/stash-create' blob | commitdiff | raw | diff to current
2007-11-14  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-12  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-12  Junio C HamanoMerge branch 'sp/maint-plug-traverse-commit-list-leak... blob | commitdiff | raw | diff to current
2007-11-11  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-10  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-08  Junio C HamanoMerge branch 'jc/clean-config' blob | commitdiff | raw | diff to current
2007-11-08  Junio C HamanoMerge branch 'ds/maint-deflatebound' blob | commitdiff | raw | diff to current
2007-11-08  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-04  Junio C HamanoMerge branch 'jc/revert-merge' blob | commitdiff | raw | diff to current
2007-11-04  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-02  Junio C HamanoMerge branch 'ph/parseopt' blob | commitdiff | raw | diff to current
2007-11-02  Junio C HamanoMerge branch 'np/progress' blob | commitdiff | raw | diff to current
2007-11-02  Junio C HamanoMerge branch 'gp/maint-diffdoc' blob | commitdiff | raw | diff to current
2007-11-02  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-11-01  Junio C HamanoMerge branch 'bk/maint-cvsexportcommit' blob | commitdiff | raw | diff to current
2007-11-01  Junio C HamanoMerge branch 'js/forkexec' blob | commitdiff | raw | diff to current
2007-11-01  Junio C HamanoMerge branch 'sp/mergetool' blob | commitdiff | raw | diff to current
2007-11-01  Junio C HamanoMerge branch 'sp/help' blob | commitdiff | raw | diff to current
2007-11-01  Junio C HamanoMerge branch 'kh/commit' blob | commitdiff | raw | diff to current
2007-10-31  Junio C HamanoMerge branch 'maint' to catch up with 1.5.3.5 blob | commitdiff | raw | diff to current
2007-10-31  Junio C HamanoMerge branch 'maint' into HEAD blob | commitdiff | raw | diff to current
2007-10-30  Junio C Hamanogit-merge: document but discourage the historical syntax blob | commitdiff | raw | diff to current
2007-10-29  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-10-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-10-27  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-10-21  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-10-21  Shawn O. PearceMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2007-10-21  Shawn O. PearceMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-10-19  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-10-19  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-10-18  Shawn O. PearceMerge branch 'jc/am-quiet' blob | commitdiff | raw | diff to current
2007-10-18  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-10-18  Shawn O. PearceMerge branch 'lt/diff-rename' blob | commitdiff | raw | diff to current
2007-10-17  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-10-16  Shawn O. PearceMerge branch 'master' into db/fetch-pack blob | commitdiff | raw | diff to current
2007-10-16  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-10-03  Junio C HamanoMerge branch 'mv/unknown' blob | commitdiff | raw | diff to current
2007-10-03  Junio C HamanoMerge branch 'ph/strbuf' blob | commitdiff | raw | diff to current
2007-10-03  Junio C HamanoMerge branch 'lh/merge' blob | commitdiff | raw | diff to current
2007-10-03  Junio C HamanoMerge branch 'js/rebase-i' blob | commitdiff | raw | diff to current
2007-10-03  Junio C HamanoMerge branch 'jc/autogc' blob | commitdiff | raw | diff to current
2007-09-29  Junio C HamanoMerge branch 'gr/smtp' blob | commitdiff | raw | diff to current
2007-09-29  Junio C HamanoMerge branch 'ss/svnimport' blob | commitdiff | raw | diff to current
2007-09-29  Junio C HamanoMerge branch 'sv/svn' blob | commitdiff | raw | diff to current
2007-09-29  Junio C HamanoMerge branch 'ml/submodule' blob | commitdiff | raw | diff to current
2007-09-29  Junio C HamanoMerge branch 'jb/remote-rm' blob | commitdiff | raw | diff to current
2007-09-29  Junio C HamanoMerge branch 'jk/diff-rename' blob | commitdiff | raw | diff to current
2007-09-29  Junio C HamanoSync with GIT 1.5.3.3 blob | commitdiff | raw | diff to current
2007-09-26  Shawn BohrerFix spelling of overridden in documentation blob | commitdiff | raw | diff to current
2007-09-24  Lars Hjemligit-merge: add support for branch.<name>.mergeoptions blob | commitdiff | raw | diff to current
2007-09-18  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into... blob | commitdiff | raw | diff to current
2007-08-29  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-08-27  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-08-26  J. Bruce FieldsMerge branch 'maint' blob | commitdiff | raw | diff to current
2007-08-21  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
2007-08-19  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2007-08-19  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.