Andrew's git / gitweb.git / history
?
update-index: refuse to add working tree items beyond symlinks
[gitweb.git] / merge-tree.c
2008-07-30 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-07-27 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-07-15 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-07-06 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5 blob | diff | raw
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-05-27 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-05-26 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-05-23 Merge branch 'maint-1.5.4' into maint v1.5.5.2 blob | diff | raw
2008-05-21 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-05-15 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-05-14 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-05-11 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-05-09 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-05-04 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-30 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-28 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-25 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-23 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-19 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-17 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-16 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-12 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-12 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-10 Merge branch 'maint-1.5.4' into maint blob | diff | raw
2008-04-09 Merge branch 'jc/rename' blob | diff | raw
2008-04-09 Merge branch 'mk/unpack-careful' blob | diff | raw
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-04-07 Merge branch 'jc/maint-apply-match-beginning' blob | diff | raw
2008-04-05 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-04-02 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-03-28 GIT 1.5.5-rc2 v1.5.5-rc2 blob | diff | raw
2008-03-27 Merge branch 'maint' blob | diff | raw
2008-03-26 Merge branch 'jc/maint-fetch-regression-1.5.4' blob | diff | raw
2008-03-16 Merge branch 'maint' blob | diff | raw
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw
2008-03-15 Merge branch 'py/submodule' blob | diff | raw
2008-03-15 Merge branch 'maint' blob | diff | raw
2008-03-15 Merge branch 'maint' blob | diff | raw
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2008-03-14 Merge branch 'mr/autoconf-fread' blob | diff | raw
2008-03-14 Merge branch 'maint' blob | diff | raw
2008-03-13 Merge branch 'maint' blob | diff | raw
2008-03-12 Merge git://repo.or.cz/git-gui blob | diff | raw
2008-03-12 Merge branch 'js/remote' blob | diff | raw
2008-03-12 Merge branch 'lt/unpack-trees' blob | diff | raw
2008-03-09 Make 'traverse_trees()' traverse conflicting DF entries... blob | diff | raw
2008-03-09 Add return value to 'traverse_tree()' callback blob | diff | raw | diff to current
2008-03-09 Make 'traverse_tree()' use linked structure rather... blob | diff | raw | diff to current
2008-03-06 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-03-01 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-03-01 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-02-23 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2008-02-23 Merge branch 'bc/reflog-fix' into js/reflog-delete blob | diff | raw | diff to current
2008-02-17 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-02-17 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-02-13 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-02-13 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-01-24 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-01-21 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-01-21 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2008-01-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2008-01-11 Merge ../gitk blob | diff | raw | diff to current
2008-01-09 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2008-01-08 Merge in GIT 1.5.3.8 blob | diff | raw | diff to current
2008-01-05 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-12-31 Merge branch 'maint' of git://linux-nfs.org/~bfields/git blob | diff | raw | diff to current
2007-12-18 Merge branch 'maint' blob | diff | raw | diff to current
2007-12-14 xdl_diff: identify call sites. blob | diff | raw | diff to current
2007-12-07 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-11-21 Merge git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-10-28 Merge branch 'master' of git://git./gitk/gitk blob | diff | raw | diff to current
2007-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2007-10-21 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-09-18 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
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-13 Merge branch 'master' of git://git./gitk/gitk 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 'js/stash' blob | diff | raw | diff to current
2007-07-07 Merge branch 'jc/diff-mark' blob | diff | raw | diff to current
next