Various merge / diff tool related minor clean-ups and improvements
Get series with b4
b4 am [email protected]Versions newest first
- v2 Latest5 patches 13 repliesIn review
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | Sort the list of tools that support both merging and diffing alphabeticallycontrib/ | +2 | 0 replies | |
| 2/5 | Use variables for the lists of tools that support merging / diffingcontrib/ | +9 | 5 replies | |
| 3/5 | Explicitly list all valid diff tools and document --tool-help as an optionDocumentation/ | +6 | 15 replies | |
| 4/5 | Make sure to use Araxis' "compare" and not e.g. ImageMagick'smergetools/ | +7 | 13 replies | |
| 5/5 | Add a few more code comments and blank lines in guess_merge_toolgit-mergetool--lib.sh | +6 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 0/5] Various merge / diff tool related minor clean-ups and improvements
This series introduces various minor clean-ups and improvements to the merge / diff tool scripts and documentation.
Sorry, the first version was missing a patch.
Sebastian Schuberth (5):
Sort the list of tools that support both merging and diffing
alphabetically
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 | 15 +++++++++++---- git-mergetool--lib.sh | 6 ++++++ mergetools/araxis | 8 +++++++- 4 files changed, 30 insertions(+), 8 deletions(-)
Signature · 1 line
1.7.11.msysgit.2