Andrew's git / gitweb.git / history
?
git-add -u: match the index with working tree.
[gitweb.git] / merge-recursive.c
2007-04-20 Kill the useless progress meter in merge-recursive blob | diff | raw
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-18 Merge branch 'maint' 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-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
2007-03-14 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-03-13 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-12 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-03-12 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-11 Merge branch 'js/diff-ni' blob | diff | raw | diff to current
2007-03-11 Merge branch 'js/revert-cherry' blob | diff | raw | diff to current
2007-03-11 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-08 Merge branch 'js/config-rename' blob | diff | raw | diff to current
2007-03-07 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-06 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-03-06 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-06 Merge branch 'master-for-junio' of git://repo.or.cz... blob | diff | raw | diff to current
2007-03-05 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-05 Merge branch 'js/fetch-progress' (early part) blob | diff | raw | diff to current
2007-03-05 Merge branch 'js/symlink' blob | diff | raw | diff to current
2007-03-05 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-04 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-04 Handle core.symlinks=false case in merge-recursive. blob | diff | raw | diff to current
2007-03-03 Merge branch 'maint' blob | diff | raw | diff to current
2007-03-02 Merge branch 'js/commit-format' blob | diff | raw | diff to current
2007-03-02 Merge branch 'maint' blob | diff | raw | diff to current
2007-02-28 Merge branch 'js/commit-by-name' blob | diff | raw | diff to current
2007-02-28 Merge branch 'js/bundle' blob | diff | raw | diff to current
2007-02-28 Merge branch 'maint' blob | diff | raw | diff to current
2007-02-28 Merge branch 'np/types' blob | diff | raw | diff to current
2007-02-28 Merge branch 'mc/sendmail' blob | diff | raw | diff to current
2007-02-27 Merge branch 'np/types' into jc/fetch blob | diff | raw | diff to current
2007-02-27 convert object type handling from a string to a number blob | diff | raw | diff to current
2007-02-26 Merge branch 'master' into js/diff-ni blob | diff | raw | diff to current
2007-02-26 Merge branch 'maint' blob | diff | raw | diff to current
2007-02-26 Merge branch 'jc/merge-symlink' into maint blob | diff | raw | diff to current
2007-02-26 merge-recursive: fix longstanding bug in merging symlinks blob | diff | raw | diff to current
2007-02-25 Merge git://repo.or.cz/git-gui into maint blob | diff | raw | diff to current
2007-02-21 Merge branch 'master' of git://repo.or.cz/git-gui into... blob | diff | raw | diff to current
2007-02-18 Merge git://git./pub/scm/gitk/gitk into maint blob | diff | raw | diff to current
2007-02-14 Merge branch 'js/reverse' blob | diff | raw | diff to current
2007-02-14 Merge branch 'jc/diff-apply-patch' blob | diff | raw | diff to current
2007-02-14 Merge branch 'jc/merge-base' (early part) blob | diff | raw | diff to current
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-02-13 Merge branch 'master' of git://repo.or.cz/git-gui blob | diff | raw | diff to current
2007-02-12 Merge git-gui blob | diff | raw | diff to current
2007-02-08 Merge branch 'master' of git://repo.or.cz/git/fastimport blob | diff | raw | diff to current
2007-02-07 Merge branch 'master' of git://repo.or.cz/git/fastimport blob | diff | raw | diff to current
2007-02-07 Merge branch 'master' of git://repo.or.cz/git/fastimport blob | diff | raw | diff to current
2007-02-05 Use pretend_sha1_file() in git-blame and git-merge... blob | diff | raw | diff to current
2007-02-04 Merge branch 'master' into np/dreflog blob | diff | raw | diff to current
2007-02-04 Keep untracked files not involved in a merge. blob | diff | raw | diff to current
2007-02-04 Assorted typo fixes blob | diff | raw | diff to current
next