From b7f3e27c0984e6d87987919db6efc8c170911c6a Mon Sep 17 00:00:00 2001 From: Jan Pilzer Date: Fri, 24 Apr 2020 08:32:24 -0700 Subject: [PATCH] Update documentation links to https (#1317) * Update links to https * Use tabs for git config --- MERGETOOL.md | 16 ++++++++-------- README.md | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MERGETOOL.md b/MERGETOOL.md index 851db1cbc..5009144b0 100644 --- a/MERGETOOL.md +++ b/MERGETOOL.md @@ -35,7 +35,7 @@ Add the `"mergeTool"` option to your ungit configuration file (.ungitrc). Set th ```json { - "mergeTool": "extMerge" + "mergeTool": "extMerge" } ``` @@ -59,11 +59,11 @@ Once you have used your merge tool to resolve the conflicts, if ungit does not i 5. Merge Tool Suggestions ------------------------- * Mac OS X: - * Meld: [meldmerge.org](http://meldmerge.org) - * Kaleidoscope: [www.kaleidoscopeapp.com](http://www.kaleidoscopeapp.com) - * Araxis Merge: [www.araxis.com](http://www.araxis.com) - * DeltaWalker: [www.deltopia.com](http://www.deltopia.com) + * Meld: [meldmerge.org](https://meldmerge.org) + * Kaleidoscope: [kaleidoscopeapp.com](https://www.kaleidoscopeapp.com) + * Araxis Merge: [araxis.com](https://araxis.com/merge) + * DeltaWalker: [deltopia.com](https://deltopia.com) * Windows: - * Beyond Compare: [www.scootersoftware.com](http://www.scootersoftware.com) - * Araxis Merge: [www.araxis.com](http://www.araxis.com) - * P4Merge: [www.perforce.com](http://www.perforce.com) + * Beyond Compare: [scootersoftware.com](https://scootersoftware.com/) + * Araxis Merge: [araxis.com](https://araxis.com/merge) + * P4Merge: [perforce.com](https://perforce.com/products/helix-core-apps/merge-diff-tool-p4merge) diff --git a/README.md b/README.md index 1cfb096fa..c35ac69d3 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ Known issues * If you're running MacOSX Mavericks and Ungit crashes after a few seconds; try updating npm and node. See [#259](https://github.com/FredrikNoren/ungit/issues/259) and [#249](https://github.com/FredrikNoren/ungit/issues/249) for details. * Ubuntu users may have trouble installing because the node executable is named differently on Ubuntu, see [#401](https://github.com/FredrikNoren/ungit/issues/401) for details. -* Debian Wheezy's supported git and nodejs packages are too old, therefore download newest [git](https://github.com/git/git/releases) and [nodejs](https://nodejs.org/download/) tarballs and [build from source](http://www.control-escape.com/linux/lx-swinstall-tar.html). +* Debian Wheezy's supported git and nodejs packages are too old, therefore download newest [git](https://github.com/git/git/releases) and [nodejs](https://nodejs.org/download/) tarballs and [build from source](https://www.control-escape.com/linux/lx-swinstall-tar.html). * Adblocker may block Ungit! Some ad blockers, such as [Adblock plus](https://adblockplus.org) and [uBlock](https://www.ublock.org/), don't like localhost api calls and assume that it is a cross domain attack. Please whitelist `{localhost|127.0.0.1|$UngitURL}:{ungit port number}`. [#887](https://github.com/FredrikNoren/ungit/issues/887) [#892](https://github.com/FredrikNoren/ungit/issues/892) * Running git in non English language will result in unexpected behavior! Ungit parses git command results in English to detect repos' states and this causes confusion when git results are not in English. [#959](https://github.com/FredrikNoren/ungit/issues/959)