projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'jc/tag'
[git] / Documentation / git-merge.txt
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2005-12-21  Junio C HamanoGIT 1.0.0 v1.0.0 blob | commitdiff | raw
2005-12-17  Junio C HamanoExamples of resetting. blob | commitdiff | raw
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-12-04  Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4 blob | commitdiff | raw | diff to current
2005-12-02  Junio C Hamanogit-merge documentation: conflicting merge leaves highe... blob | commitdiff | raw | diff to current
2005-11-29  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-29  Junio C HamanoDocumentation: Describe merge operation a bit better. blob | commitdiff | raw | diff to current
2005-11-28  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-07  Junio C HamanoMerge branch 'master' blob | commitdiff | raw | diff to current
2005-11-07  Jon LoeligerRefactored merge options into separate merge-options... blob | commitdiff | raw | diff to current
2005-11-07  Junio C HamanoGIT 0.99.9e v0.99.9e blob | commitdiff | raw | diff to current
2005-11-06  Jon LoeligerRefactor merge strategies into separate includable... blob | commitdiff | raw | diff to current
2005-11-05  Junio C HamanoGIT 0.99.9d v0.99.9d blob | commitdiff | raw | diff to current
2005-11-05  Junio C HamanoDocumentation: git-fetch/pull updates. blob | commitdiff | raw | diff to current
2005-11-04  Junio C HamanoDocumentation: -merge and -pull: describe merge strategies. blob | commitdiff | raw | diff to current
2005-11-02  Junio C HamanoGIT 0.99.9b v0.99.9b blob | commitdiff | raw | diff to current
2005-11-01  Petr BaudisDocumentation for git-fmt-merge-msg blob | commitdiff | raw | diff to current
2005-10-31  Junio C HamanoGIT 0.99.9a v0.99.9a blob | commitdiff | raw | diff to current
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-10-23  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-21  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-18  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-16  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-16  Junio C HamanoMerge branch 'svn' of netz.smurf.noris.de/git/git blob | commitdiff | raw | diff to current
2005-10-15  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-12  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-10  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-10  Junio C HamanoRemove the version tags from the manpages blob | commitdiff | raw | diff to current
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-09-25  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-09-24  Junio C HamanoMerge 'fixes' branch. blob | commitdiff | raw | diff to current
2005-09-23  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-09-21  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-09-20  Sergey Vlasov[PATCH] Documentation: Update all files to use the... blob | commitdiff | raw | diff to current
2005-09-11  Junio C Hamano'git-merge': Documentation. blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.