Various merge / diff tool related minor clean-ups and improvements
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest1 of 4 patches 0 repliesNew
1 of 4 patches is in this archive. The cover letter announces 4.
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | Use variables for the lists of tools that support merging / diffingcontrib/ | +11 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/4] Various merge / diff tool related minor clean-ups and improvements
This series introduce various minor clean-ups and improvements to the merge / diff tool scripts and documentation.
Sebastian Schuberth (4):
Use variables for the lists of tools that support merging / diffing Explicitly list all valid diff tools and document --tool-help as an
option
Make sure to use Araxis' "compare" and not e.g. ImageMagick's Add a few more code comments and blank lines in guess_merge_tool
Documentation/git-difftool.txt | 9 ++++++--- contrib/completion/git-completion.bash | 11 +++++++++-- git-mergetool--lib.sh | 6 ++++++ mergetools/araxis | 8 +++++++- 4 files changed, 28 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.11.msysgit.2