Andrew's git / gitweb.git / history
?
merge-recursive --renormalize
[gitweb.git] / Documentation / git-merge-file.txt
2009-02-06 Merge branch 'sg/maint-gitdir-in-subdir' into maint blob | diff | raw
2009-02-06 Merge branch 'lt/maint-wrap-zlib' into maint blob | diff | raw
2009-02-06 Merge branch 'js/maint-all-implies-HEAD' into maint blob | diff | raw
2009-02-06 Merge branch 'kc/maint-diff-bwi-fix' into maint blob | diff | raw
2009-02-04 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-02-04 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-02-03 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-02-01 Merge branch 'ks/maint-mailinfo-folded' blob | diff | raw
2009-02-01 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-29 Merge branch 'jc/maint-format-patch-o-relative' into... blob | diff | raw
2009-01-29 Merge branch 'bs/maint-rename-populate-filespec' into... blob | diff | raw
2009-01-29 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-27 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-27 Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into... blob | diff | raw
2009-01-26 Merge branch 'js/maint-all-implies-HEAD' blob | diff | raw
2009-01-24 Merge branch 'cb/maint-unpack-trees-absense' into maint blob | diff | raw
2009-01-24 Merge branch 'tr/maint-no-index-fixes' into maint blob | diff | raw
2009-01-24 Merge branch 'jc/maint-format-patch' into maint blob | diff | raw
2009-01-24 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-22 Merge branch 'kc/maint-diff-bwi-fix' blob | diff | raw
2009-01-22 Merge branch 'lt/maint-wrap-zlib' blob | diff | raw
2009-01-22 Merge branch 'sg/maint-gitdir-in-subdir' blob | diff | raw
2009-01-22 Merge branch 'jc/maint-format-patch-o-relative' blob | diff | raw
2009-01-21 Merge branch 'bs/maint-rename-populate-filespec' blob | diff | raw
2009-01-20 Merge branch 'kc/maint-diff-bwi-fix' blob | diff | raw
2009-01-18 Merge branch 'ds/uintmax-config' blob | diff | raw
2009-01-18 Merge branch 'gb/gitweb-patch' blob | diff | raw
2009-01-18 Merge branch 'jc/maint-format-patch' blob | diff | raw
2009-01-18 Merge branch 'tr/maint-no-index-fixes' blob | diff | raw
2009-01-18 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-15 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-15 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-14 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-14 Merge branch 'js/bundle-tags' blob | diff | raw
2009-01-14 Merge branch 'cb/maint-unpack-trees-absense' blob | diff | raw
2009-01-13 Merge branch 'cb/maint-merge-recursive-fix' into maint blob | diff | raw
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint blob | diff | raw
2009-01-13 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-12 Merge branch 'jc/maint-do-not-switch-to-non-commit... blob | diff | raw
2009-01-07 Merge branch 'jn/gitweb-blame' blob | diff | raw
2009-01-07 Merge branch 'wp/add-p-goto' blob | diff | raw
2009-01-07 Merge branch 'maint-1.6.0' into maint blob | diff | raw
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0 blob | diff | raw | diff to current
2009-01-03 Merge branch 'jc/maint-do-not-switch-to-non-commit' blob | diff | raw
2009-01-03 Merge branch 'ap/maint-apply-modefix' blob | diff | raw
2009-01-01 Merge branch 'cb/mergetool' blob | diff | raw
2008-12-29 Merge branch 'lt/reset-merge' blob | diff | raw
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into... blob | diff | raw
2008-12-22 Merge branch 'maint' blob | diff | raw
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-12-20 Merge branch 'maint' to sync with GIT 1.6.0.6 blob | diff | raw
2008-12-20 GIT 1.6.0.6 v1.6.0.6 blob | diff | raw | diff to current
2008-12-18 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-12-17 GIT 1.5.6.6 v1.5.6.6 blob | diff | raw | diff to current
2008-12-16 Merge branch 'maint' blob | diff | raw
2008-12-15 Merge branch 'cb/maint-merge-recursive-fix' into cb... blob | diff | raw
2008-12-13 Merge branch 'maint' blob | diff | raw
2008-12-11 Merge branch 'maint' blob | diff | raw
2008-12-10 Merge branch 'maint' blob | diff | raw
2008-12-10 Improve language in git-merge.txt and related docs blob | diff | raw
2008-12-02 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-12-01 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-16 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-11-13 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-02 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-09-25 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-09-07 Merge updated git-gui and gitk that call each other blob | diff | raw | diff to current
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-08-17 Merge git-gui 0.11.0 blob | diff | raw | diff to current
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-08-14 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-13 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-12 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-11 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-09 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-06 Sync with 1.5.6.5 blob | diff | raw | diff to current
2008-08-06 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-08-06 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-03 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Merge branch 'maint' blob | diff | raw | diff to current
2008-08-02 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-30 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-27 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-07-25 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-24 Merge branch 'maint' into ph/checkout blob | diff | raw | diff to current
2008-07-21 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-19 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-17 Merge branch 'sp/maint-index-pack' blob | diff | raw | diff to current
2008-07-17 Merge branch 'maint' blob | diff | raw | diff to current
2008-07-16 Merge branch 'mv/merge-in-c' blob | diff | raw | diff to current
2008-07-16 Merge branch 'ag/rewrite_one' blob | diff | raw | diff to current
2008-07-16 Merge branch 'js/maint-pretty-mailmap' blob | diff | raw | diff to current
2008-07-15 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
next