On 0, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Markus Heidelberg <markus.heidelberg@xxxxxx> writes: > > >> + tools="$(echo "$tools" | sed -e 's/ +/ /g')" > > > > Doesn't work for me. For me 's/ \+/ /g' works. > > ...like this: 's/[ ]\+/ /g' (space and tab) > > Pleae don't. "s/ */ /g' should be the most portable (the point being "do > not use one-or-more +"). v5 14/14. good stuff. > > Looks good to me, after these last 2 issues are adjusted. > > Maybe resend the whole series then, so that Junio can apply them easily? > > Thanks. I've replaced the series with the following applied on top of the > 'master', but I won't be merging them to 'next' for tonight, I guess. > > ... > [PATCH v2 07/14] difftool: add a -y shortcut for --no-prompt > [PATCH v2 09/14] difftool: move 'git-difftool' out of contrib > [PATCH v3 10/14] difftool: add various git-difftool tests > [PATCH v2 11/14] difftool: add support for a difftool.prompt config variable > [PATCH v4 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib > > It appears that, assuming that up to 13/14 above is what you two expected > me to pick up, we would perhaps need to only replace 14/14? Yup > > As the final sanity check, please eyeball the attached interdiff, created > this way: That looks right to me. > > $ git checkout master^0 > $ git am -s ./+da-fourteen-patches > $ A=$(git rev-parse HEAD) > $ git reset --hard master > $ git merge da/difftool ;# old series > $ git diff --stat -p HEAD $A ;# what's new in the new series? > > Documentation/config.txt | 3 +- > Documentation/git-mergetool.txt | 2 +- > Documentation/merge-config.txt | 6 +- > command-list.txt | 1 - > contrib/completion/git-completion.bash | 2 +- > git-mergetool--lib.sh | 237 ++++++++++++++++++-------------- > t/t7800-difftool.sh | 4 +- > 7 files changed, 144 insertions(+), 111 deletions(-) > > diff --git a/Documentation/config.txt b/Documentation/config.txt > ... -- David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html