Fix "git difftool --tool-help"
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest4 patches 5 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | git-mergetool: move show_tool_help to mergetool--libgit-mergetool--lib.sh git-mergetool.sh | +37 | 0 replies | |
| 2/4 | git-mergetool: remove redundant assignmentgit-mergetool--lib.sh | +0 | 0 replies | |
| 3/4 | git-mergetool: don't hardcode 'mergetool' in show_tool_helpgit-mergetool--lib.sh | +4 | 0 replies | |
| 4/4 | git-difftool: use git-mergetool--lib for "--tool-help"git-difftool.perl | +8 | 4 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/4] Fix "git difftool --tool-help"
The "--tool-help" option to git-difftool currently displays incorrect output since it uses the names of the files in "$GIT_EXEC_PATH/mergetools/" rather than the list of command names in git-mergetool--lib.
This series fixes this by changing it to simply delegate to a function in git-mergetool--lib.
The first three patches are just refactorings to move the show_tool_help function from git-mergetool to git-mergetool--lib and make it usable by git-difftool. The final patch switches git-difftool to use this function.
John Keeping (4):
git-mergetool: move show_tool_help to mergetool--lib
git-mergetool: remove redundant assignment
git-mergetool: don't hardcode 'mergetool' in show_tool_help
git-difftool: use git-mergetool--lib for "--tool-help"
git-difftool.perl | 57 ++++++++------------------------------------------- git-mergetool--lib.sh | 38 ++++++++++++++++++++++++++++++++++ git-mergetool.sh | 37 --------------------------------- 3 files changed, 46 insertions(+), 86 deletions(-)
Signature · 1 line
1.8.1