Andrew's git / gitweb.git / history
?
apply: get rid of --index-info in favor of --build-fake-ancestor
[gitweb.git] / merge-recursive.c
2007-09-19 Merge branch 'maint' blob | diff | raw
2007-09-18 Merge branch 'cr/reset' blob | diff | raw
2007-09-18 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-09-14 Merge branch 'jc/cachetree' into cr/reset blob | diff | raw
2007-09-12 Move make_cache_entry() from merge-recursive.c into... blob | diff | raw
2007-08-29 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-08-27 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-08-26 Merge branch 'maint' blob | diff | raw | diff to current
2007-08-21 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-08-19 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-08-19 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-08-16 Merge branch 'maint' to sync with 1.5.2.5 blob | diff | raw | diff to current
2007-08-15 Use xmkstemp() instead of mkstemp() blob | diff | raw | diff to current
2007-08-15 merge-recursive: do not rudely die on binary merge blob | diff | raw | diff to current
2007-08-13 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-08-11 Merge branch 'cr/tag' blob | diff | raw | diff to current
2007-08-11 Merge branch 'jc/clone' blob | diff | raw | diff to current
2007-08-10 Merge branch 'lt/readtree' blob | diff | raw | diff to current
2007-08-10 Start moving unpack-trees to "struct tree_desc" blob | diff | raw | diff to current
2007-08-06 Merge branch 'maint' blob | diff | raw | diff to current
2007-08-05 Merge branch 'maint' blob | diff | raw | diff to current
2007-08-01 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-30 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-07-28 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-07-19 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-14 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-07-12 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-07-12 Merge commit 'git-gui/master' blob | diff | raw | diff to current
2007-07-12 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-12 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-07-10 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-09 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-07 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-04 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-03 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-03 Merge branch 'maint' blob | diff | raw | diff to current
2007-07-02 Merge 1.5.2.3 in blob | diff | raw | diff to current
2007-07-01 Merge branch 'ml/worktree' blob | diff | raw | diff to current
2007-07-01 Merge branch 'ei/worktree+filter' blob | diff | raw | diff to current
2007-06-30 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-29 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-29 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-06-29 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-06-28 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-06-27 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-26 Merge branch 'master' of git://git./gitk/gitk into... blob | diff | raw | diff to current
2007-06-23 Merge branch 'jc/oneline' blob | diff | raw | diff to current
2007-06-23 Merge branch 'ei/oneline+add-empty' blob | diff | raw | diff to current
2007-06-23 Merge branch 'js/filter' blob | diff | raw | diff to current
2007-06-22 Import branch 'git-p4' of git://repo.or.cz/fast-export blob | diff | raw | diff to current
2007-06-16 Merge branch 'jc/remote' blob | diff | raw | diff to current
2007-06-16 Merge branch 'gp/branch' blob | diff | raw | diff to current
2007-06-16 Merge branch 'fl/cvsserver' blob | diff | raw | diff to current
2007-06-16 Merge branch 'lh/submodule' blob | diff | raw | diff to current
2007-06-16 Merge branch 'maint' to sync with GIT 1.5.2.2 blob | diff | raw | diff to current
2007-06-16 merge-recursive: refuse to merge binary files blob | diff | raw | diff to current
2007-06-13 -Wold-style-definition fix blob | diff | raw | diff to current
2007-06-13 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-12 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-12 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-06-12 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-06-11 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-06-11 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-11 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-06-10 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-09 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-09 Merge branch 'ar/clone' blob | diff | raw | diff to current
2007-06-08 Merge branch 'maint' blob | diff | raw | diff to current
2007-06-06 Merge branch 'js/filter' into ei/worktree+filter blob | diff | raw | diff to current
2007-06-06 Merge branch 'sv/objfixes' blob | diff | raw | diff to current
2007-06-06 Merge branch 'mm/tag' blob | diff | raw | diff to current
2007-06-06 Merge branch 'gb/idx' blob | diff | raw | diff to current
2007-06-05 merge-recursive: refuse to merge binary files blob | diff | raw | diff to current
2007-05-31 Merge branch 'maint-1.5.1' into maint blob | diff | raw | diff to current
2007-05-29 Merge branch 'maint-1.5.1' into maint blob | diff | raw | diff to current
2007-05-29 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-05-26 Merge branch 'maint-1.5.1' into maint blob | diff | raw | diff to current
2007-05-25 Merge branch 'maint-1.5.1' into maint blob | diff | raw | diff to current
2007-05-24 Merge branch 'maint-1.5.1' into maint blob | diff | raw | diff to current
2007-05-23 Merge branch 'maint-1.5.1' into maint blob | diff | raw | diff to current
2007-05-22 Merge branch 'maint-1.5.1' into maint blob | diff | raw | diff to current
2007-05-21 Merge branch 'maint-1.5.1' into maint blob | diff | raw | diff to current
2007-05-20 Merge branch 'maint' to synchronize with 1.5.1.6 blob | diff | raw | diff to current
2007-05-19 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-19 Merge 1.5.1.5 in blob | diff | raw | diff to current
2007-05-18 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-17 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-05-16 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-15 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-13 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-12 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-10 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-05-10 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-10 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-09 Merge branch 'maint' blob | diff | raw | diff to current
2007-05-08 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-05-07 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-05-07 Merge branch 'maint' blob | diff | raw | diff to current
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
next