git merge documentation: -m is optional
[git/git.git] / Documentation / git-merge.txt
2007-02-13 Matthias Lederhofergit merge documentation: -m is optional
2007-02-13 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12 Junio C HamanoMerge git-gui
2007-01-31 Junio C HamanoMerge branch 'master' of git://linux-nfs.org/~bfields/git
2007-01-30 Shawn O. PearceMerge branch 'master' into sp/gfi
2007-01-18 Junio C HamanoDocumentation: sync git.txt command list and manual...
2007-01-15 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14 Shawn O. PearceMerge branch 'master' into sp/fast-import
2007-01-09 Junio C HamanoMerge branch 'maint'
2007-01-05 Junio C HamanoMerge branch 'maint'
2006-12-29 Junio C HamanoMerge branch 'jc/curl'
2006-12-29 Junio C HamanoMerge branch 'jc/utf8'
2006-12-29 Junio C HamanoMerge branch 'jc/make'
2006-12-28 Junio C HamanoMerge branch 'js/shallow'
2006-12-28 Shawn O. PearceUse GIT_REFLOG_ACTION environment variable instead.
2006-12-27 Junio C HamanoMerge branch 'master' into js/shallow
2006-12-22 Junio C HamanoMerge branch 'maint'
2006-12-20 Junio C HamanoMerge branch 'maint'
2006-12-14 Junio C HamanoMerge branch 'maint'
2006-12-13 Junio C HamanoMerge branch 'jc/commit-careful'
2006-12-13 Junio C HamanoMerge branch 'maint'
2006-12-13 Junio C HamanoMerge branch 'maint'
2006-12-11 Junio C HamanoMerge branch 'maint'
2006-12-07 Junio C HamanoMerge branch 'maint'
2006-12-06 Junio C HamanoMerge branch 'maint'
2006-12-05 Junio C HamanoMerge branch 'maint'
2006-12-03 Junio C HamanoMerge branch 'maint'
2006-11-29 Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-29 Junio C HamanoMerge branch 'maint'
2006-11-29 Junio C HamanoMerge branch 'jc/globfetch'
2006-11-29 Junio C HamanoMerge branch 'maint'
2006-11-27 Junio C HamanoMerge branch 'js/shortlog'
2006-11-27 Junio C HamanoMerge branch 'jc/push-delete-ref'
2006-11-27 Junio C HamanoMerge branch 'jc/merge'
2006-11-22 Junio C Hamanogit-merge: make it usable as the first class UI
2006-11-08 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-09-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13 Junio C HamanoMerge branch 'jc/upload-pack'
2006-08-13 Junio C HamanoMerge branch 'th/diff-extra'
2006-08-13 Junio C HamanoGIT 1.4.2 v1.4.2
2006-08-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08 Junio C HamanoMerge branch 'master' into pb/gitpm
2006-07-30 Junio C HamanoMerge branch 'jn/make'
2006-07-26 Junio C HamanoMerge branch 'pb/configure'
2006-07-13 Junio C HamanoMerge branch 'ml/trace'
2006-07-13 Junio C HamanoMerge branch 'lt/prune'
2006-07-13 Junio C HamanoMerge branch 'lt/merge-tree'
2006-07-10 Junio C HamanoMerge branch 'jc/show-merge'
2006-07-10 Junio C HamanoMerge branch 'lt/gitweb'
2006-07-10 Junio C HamanoMerge branch 'jc/rename'
2006-07-10 Junio C HamanoMerge branch 'jc/grep'
2006-07-10 Junio C HamanoMerge branch 'jc/mailinfo'
2006-07-10 Junio C HamanoMerge branch 'ew/diff'
2006-07-10 Junio C HamanoMerge branch 'ew/svn'
2006-07-09 Pavel RoskinAssorted typo fixes
2006-06-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Junio C HamanoMerge branch 'new' of git://git./gitk/gitk into next
2006-06-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-31 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-21 Junio C HamanoGIT 1.0.0 v1.0.0
2005-12-17 Junio C HamanoExamples of resetting.
2005-12-07 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04 Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4
2005-12-02 Junio C Hamanogit-merge documentation: conflicting merge leaves highe...
2005-11-29 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 Junio C HamanoDocumentation: Describe merge operation a bit better.
2005-11-28 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-07 Junio C HamanoMerge branch 'master'
2005-11-07 Jon LoeligerRefactored merge options into separate merge-options...
2005-11-07 Junio C HamanoGIT 0.99.9e v0.99.9e
2005-11-06 Jon LoeligerRefactor merge strategies into separate includable...
2005-11-05 Junio C HamanoGIT 0.99.9d v0.99.9d
2005-11-05 Junio C HamanoDocumentation: git-fetch/pull updates.
2005-11-04 Junio C HamanoDocumentation: -merge and -pull: describe merge strategies.
2005-11-02 Junio C HamanoGIT 0.99.9b v0.99.9b
2005-11-01 Petr BaudisDocumentation for git-fmt-merge-msg
2005-10-31 Junio C HamanoGIT 0.99.9a v0.99.9a
2005-10-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23 Junio C HamanoMerge branch 'fixes'
2005-10-21 Junio C HamanoMerge branch 'fixes'
2005-10-18 Junio C HamanoMerge branch 'fixes'
2005-10-16 Junio C HamanoMerge branch 'fixes'
2005-10-16 Junio C HamanoMerge branch 'svn' of netz.smurf.noris.de/git/git
2005-10-15 Junio C HamanoMerge branch 'fixes'
2005-10-12 Junio C HamanoMerge branch 'fixes'
2005-10-10 Junio C HamanoMerge branch 'fixes'
next