John Keeping <j...@keeping.me.uk> writes: > On Wed, Mar 27, 2013 at 02:47:25PM -0700, Junio C Hamano wrote: >> > * jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits >> > (merged to 'next' on 2013-03-19 at e68014a) >> > + difftool --dir-diff: symlink all files matching the working tree >> > + difftool: avoid double slashes in symlink targets >> > + git-difftool(1): fix formatting of --symlink description >> >> I lost track of various discussions on "difftool" and its "symlink >> so that the user can edit working tree files in the tool". > > Would it be easiest if I send a new series incorporating > jk/difftool-dirr-diff-edit-fix and the proposed change to not overwrite > modified working tree files, built on top of t7800-modernize?
I am somewhat reluctant to rewind a topic that has been cooking in 'next' for over a week (the above says 19th). Rebuilding the style-fixes on top of the above is fine---that topic is much younger. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
