Andrew's git / gitweb.git / history
?
Merge branch 'jl/daemon'
[gitweb.git] / Documentation / git-merge.txt
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-08-13 Merge branch 'jc/upload-pack' blob | diff | raw
2006-08-13 Merge branch 'th/diff-extra' blob | diff | raw
2006-08-13 GIT 1.4.2 v1.4.2 blob | diff | raw
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2006-07-30 Merge branch 'jn/make' blob | diff | raw
2006-07-26 Merge branch 'pb/configure' blob | diff | raw
2006-07-13 Merge branch 'ml/trace' blob | diff | raw
2006-07-13 Merge branch 'lt/prune' blob | diff | raw
2006-07-13 Merge branch 'lt/merge-tree' blob | diff | raw
2006-07-10 Merge branch 'jc/show-merge' blob | diff | raw
2006-07-10 Merge branch 'lt/gitweb' blob | diff | raw
2006-07-10 Merge branch 'jc/rename' blob | diff | raw
2006-07-10 Merge branch 'jc/grep' blob | diff | raw
2006-07-10 Merge branch 'jc/mailinfo' blob | diff | raw
2006-07-10 Merge branch 'ew/diff' blob | diff | raw
2006-07-10 Merge branch 'ew/svn' blob | diff | raw
2006-07-09 Assorted typo fixes blob | diff | raw
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb blob | diff | raw | diff to current
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next blob | diff | raw | diff to current
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-05-03 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-04-24 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-04-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-04-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-04-05 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-03-31 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-03-26 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-12-21 GIT 1.0.0 v1.0.0 blob | diff | raw | diff to current
2005-12-17 Examples of resetting. blob | diff | raw | diff to current
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-12-04 GIT 0.99.9l aka 1.0rc4 v0.99.9lv1.0rc4 blob | diff | raw | diff to current
2005-12-02 git-merge documentation: conflicting merge leaves highe... blob | diff | raw | diff to current
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-29 Documentation: Describe merge operation a bit better. blob | diff | raw | diff to current
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-07 Merge branch 'master' blob | diff | raw | diff to current
2005-11-07 Refactored merge options into separate merge-options... blob | diff | raw | diff to current
2005-11-07 GIT 0.99.9e v0.99.9e blob | diff | raw | diff to current
2005-11-06 Refactor merge strategies into separate includable... blob | diff | raw | diff to current
2005-11-05 GIT 0.99.9d v0.99.9d blob | diff | raw | diff to current
2005-11-05 Documentation: git-fetch/pull updates. blob | diff | raw | diff to current
2005-11-04 Documentation: -merge and -pull: describe merge strategies. blob | diff | raw | diff to current
2005-11-02 GIT 0.99.9b v0.99.9b blob | diff | raw | diff to current
2005-11-01 Documentation for git-fmt-merge-msg blob | diff | raw | diff to current
2005-10-31 GIT 0.99.9a v0.99.9a blob | diff | raw | diff to current
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-10-23 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-21 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-18 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-16 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-16 Merge branch 'svn' of netz.smurf.noris.de/git/git blob | diff | raw | diff to current
2005-10-15 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-12 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-10 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-10 Remove the version tags from the manpages blob | diff | raw | diff to current
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-09-25 Merge branch 'fixes' blob | diff | raw | diff to current
2005-09-24 Merge 'fixes' branch. blob | diff | raw | diff to current
2005-09-23 Merge branch 'fixes' blob | diff | raw | diff to current
2005-09-21 Merge branch 'fixes' blob | diff | raw | diff to current
2005-09-20 [PATCH] Documentation: Update all files to use the... blob | diff | raw | diff to current
2005-09-11 'git-merge': Documentation. blob | diff | raw | diff to current