Andrew's git / gitweb.git / history
?
Add "skip_unmerged" option to unpack_trees.
[gitweb.git] / merge-recursive.c
2007-05-19 Merge branch 'maint' blob | diff | raw
2007-05-19 Merge 1.5.1.5 in blob | diff | raw
2007-05-18 Merge branch 'maint' blob | diff | raw
2007-05-17 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-05-16 Merge branch 'maint' blob | diff | raw
2007-05-15 Merge branch 'maint' blob | diff | raw
2007-05-13 Merge branch 'maint' blob | diff | raw
2007-05-12 Merge branch 'maint' blob | diff | raw
2007-05-10 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-05-10 Merge branch 'maint' blob | diff | raw
2007-05-10 Merge branch 'maint' blob | diff | raw
2007-05-09 Merge branch 'maint' blob | diff | raw
2007-05-08 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-05-07 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2007-05-07 Merge branch 'maint' blob | diff | raw
2007-05-07 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-05-07 Merge git://git2./pub/scm/gitk/gitk into maint blob | diff | raw | diff to current
2007-05-06 Merge branch 'maint' blob | diff | raw
2007-05-04 Merge branch 'maint' blob | diff | raw
2007-05-02 Merge branch 'maint' blob | diff | raw
2007-05-02 Merge branch 'gfi-maint' into gfi-master blob | diff | raw
2007-05-01 Merge branch 'maint' blob | diff | raw
2007-04-29 Merge branch 'jc/attr' blob | diff | raw
2007-04-29 Merge branch 'maint' blob | diff | raw
2007-04-29 Merge branch 'gfi-maint' into gfi-master blob | diff | raw
2007-04-27 Merge branch 'maint' blob | diff | raw
2007-04-26 Ignore merged status of the file-level merge blob | diff | raw
2007-04-26 Add a test for merging changed and rename-changed branches blob | diff | raw | diff to current
2007-04-26 Avoid excessive rewrites in merge-recursive blob | diff | raw | diff to current
2007-04-26 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-25 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-25 Merge branch 'master' of git://repo.or.cz/git/fastimport blob | diff | raw | diff to current
2007-04-24 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-22 Merge branch 'lt/objalloc' blob | diff | raw | diff to current
2007-04-22 Merge branch 'jc/add' blob | diff | raw | diff to current
2007-04-22 Merge branch 'jc/attr' blob | diff | raw | diff to current
2007-04-22 Merge branch 'lt/gitlink' blob | diff | raw | diff to current
2007-04-22 Merge branch 'np/pack' blob | diff | raw | diff to current
2007-04-22 Merge branch 'jp/refs' blob | diff | raw | diff to current
2007-04-22 Merge branch 'jc/quickfetch' blob | diff | raw | diff to current
2007-04-22 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-21 Fix bogus linked-list management for user defined merge... blob | diff | raw | diff to current
2007-04-20 Kill the useless progress meter in merge-recursive blob | diff | raw | diff to current
2007-04-20 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-20 Fix working directory errno handling when unlinking... blob | diff | raw | diff to current
2007-04-19 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-19 Simplify code to find recursive merge driver. blob | diff | raw | diff to current
2007-04-19 Counto-fix in merge-recursive blob | diff | raw | diff to current
2007-04-18 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-18 Fix funny types used in attribute value representation blob | diff | raw | diff to current
2007-04-18 Allow low-level driver to specify different behaviour... blob | diff | raw | diff to current
2007-04-18 Custom low-level merge driver: change the configuration... blob | diff | raw | diff to current
2007-04-18 Allow the default low-level merge driver to be configured. blob | diff | raw | diff to current
2007-04-18 Custom low-level merge driver support. blob | diff | raw | diff to current
2007-04-18 Merge branch 'fl/cvsserver' blob | diff | raw | diff to current
2007-04-18 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-18 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-18 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-04-18 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-04-17 Merge branch 'jc/read-tree-df' blob | diff | raw | diff to current
2007-04-17 Allow specifying specialized merge-backend per path. blob | diff | raw | diff to current
2007-04-17 merge-recursive: separate out xdl_merge() interface. blob | diff | raw | diff to current
2007-04-16 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-16 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-15 Merge git://git2./pub/scm/gitk/gitk into maint blob | diff | raw | diff to current
2007-04-14 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-13 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-12 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-10 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-10 merge-recursive: handle D/F conflict case more carefully. blob | diff | raw | diff to current
2007-04-10 merge-recursive: do not barf on "to be removed" entries. blob | diff | raw | diff to current
2007-04-09 Merge branch 'jc/push' blob | diff | raw | diff to current
2007-04-09 Merge branch 'jc/merge-subtree' blob | diff | raw | diff to current
2007-04-09 Merge branch 'js/fetch-progress' blob | diff | raw | diff to current
2007-04-09 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-08 Merge branch 'jc/read-tree-df' (early part) blob | diff | raw | diff to current
2007-04-08 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-07 A new merge stragety 'subtree'. blob | diff | raw | diff to current
2007-04-07 Merge branch 'jc/index-output' blob | diff | raw | diff to current
2007-04-07 Merge branch 'jc/checkout' (early part) blob | diff | raw | diff to current
2007-04-07 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-05 Merge branch 'maint' blob | diff | raw | diff to current
2007-04-05 Fix bogus error message from merge-recursive error... blob | diff | raw | diff to current
2007-04-04 Merge branch 'jc/bisect' blob | diff | raw | diff to current
2007-04-04 Merge branch 'fl/doc' blob | diff | raw | diff to current
2007-04-04 _GIT_INDEX_OUTPUT: allow plumbing to output to an alter... blob | diff | raw | diff to current
2007-04-04 Merge 1.5.0.7 in blob | diff | raw | diff to current
2007-03-31 Keep rename/rename conflicts of intermediate merges... blob | diff | raw | diff to current
2007-03-30 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-28 Merge branch 'maint' to synchronize with 1.5.0.6 blob | diff | raw | diff to current
2007-03-25 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-25 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-24 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-22 Merge git://git2.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2007-03-22 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-20 Merge git://git2.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2007-03-18 Merge 1.5.0.5 in from 'maint' blob | diff | raw | diff to current
2007-03-17 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-14 Merge GIT 1.5.0.4 blob | diff | raw | diff to current
2007-03-14 Merge branch 'jc/fetch' blob | diff | raw | diff to current
next