resolve-undo: teach "update-index --unresolve" to use resolve-undo info

Junio C Hamano committed almost 17 years ago

resolve-undo: "checkout -m path" uses resolve-undo information

Junio C Hamano committed almost 17 years ago

resolve-undo: allow plumbing to clear the information

Junio C Hamano committed almost 17 years ago

resolve-undo: basic tests

Junio C Hamano committed almost 17 years ago

resolve-undo: record resolved conflicts in a new index extension section

Junio C Hamano committed almost 17 years ago

builtin-merge.c: use standard active_cache macros

Junio C Hamano committed almost 17 years ago

Git 1.6.6

Junio C Hamano committed almost 17 years ago

git svn: add test for a git svn gc followed by a git svn mkdirs

Robert Zeh committed almost 17 years ago

git svn: branch/tag commands detect username in URLs

Eric Wong committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

git svn: lookup new parents correctly from svn:mergeinfo

Eric Wong committed almost 17 years ago

Prevent git blame from segfaulting on a missing author name

David Reiss committed almost 17 years ago

git-svn: Remove obsolete MAXPARENT check

Andrew Myrick committed almost 17 years ago

git-svn: detect cherry-picks correctly.

Sam Vilain committed almost 17 years ago

git-svn: exclude already merged tips using one rev-list call

Sam Vilain committed almost 17 years ago

git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges

Sam Vilain committed almost 17 years ago

git-svn: memoize conversion of SVN merge ticket info to git commit ranges

Sam Vilain committed almost 17 years ago

git-svn: expand the svn mergeinfo test suite, highlighting some failures

Sam Vilain committed almost 17 years ago

update release notes for git svn in 1.6.6

Eric Wong committed almost 17 years ago

git svn: fix --revision when fetching deleted paths

Eric Wong committed almost 17 years ago