On Sun, Feb 03, 2013 at 04:13:22AM -0800, David Aguilar wrote: > On Sat, Feb 2, 2013 at 9:44 PM, Junio C Hamano <gits...@pobox.com> wrote: > > Junio C Hamano <gits...@pobox.com> writes: > > > > Regarding these two topics.... > > > >> * da/mergetool-docs (2013-01-30) 7 commits > >> - doc: generate a list of valid merge tools > >> - mergetool--lib: list user configured tools in '--tool-help' > >> - fixup! doc: generate a list of valid merge tools > >> - fixup! mergetool--lib: add functions for finding available tools > >> - mergetool--lib: add functions for finding available tools > >> - mergetool--lib: improve the help text in guess_merge_tool() > >> - mergetool--lib: simplify command expressions > >> (this branch uses jk/mergetool.) > >> > >> Build on top of the clean-up done by jk/mergetool and automatically > >> generate the list of mergetool and difftool backends the build > >> supports to be included in the documentation. > >> > >> Will merge to 'next', after squashing the fixup! commits from John > >> Keeping. > >> > >> > >> * jk/mergetool (2013-01-28) 8 commits > >> - mergetools: simplify how we handle "vim" and "defaults" > >> - mergetool--lib: don't call "exit" in setup_tool > >> - mergetool--lib: improve show_tool_help() output > >> - mergetools/vim: remove redundant diff command > >> - git-difftool: use git-mergetool--lib for "--tool-help" > >> - git-mergetool: don't hardcode 'mergetool' in show_tool_help > >> - git-mergetool: remove redundant assignment > >> - git-mergetool: move show_tool_help to mergetool--lib > >> (this branch is used by da/mergetool-docs.) > >> > >> Cleans up mergetool/difftool combo. > >> > >> This is looking ready for 'next'. > > > > Do the tips of these two topics look reasonable to both of you, or > > are there anything you sent but I missed? > > It looks good to go. The additional "|| :" in the makefile is a nice > touchup that made it more robust too.
Looks good to me as well. John -- 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