Prepare v1.6.0

jorio · jorio · commit 7293dc4e86cd · 2026-02-01T23:24:40.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # GitFourchette version history
 
+## 1.6.0 (2026-02-01)
+
+New features:
+
+- **Mount commits as folders.** This lets you browse the workdir at a specific point in time using your system's file manager. Available by right-clicking a commit in the Commit History. (FUSE 3 required + new optional dependency 'mfusepy')
+- **Auto-fetch remotes periodically (experimental).** Enable this *Settings → Advanced → Auto-fetch remotes every N minutes.*
+
+Quality of life improvements:
+
+- FileList: Improve path readability by muting color of directory string (#77)
+- GraphView context menu: Show branch name instead of "Reset HEAD to Here" (#71)
+- GraphView context menu: Offer merging for any commit, not just branch tips (#74)
+- Image diffs: Ability to toggle between old/new images
+- Blame: Emphasize "new" lines with a different background color in the gutter
+- Allow pressing the Escape key to quickly close detached diff/blame windows
+
+Bug fixes:
+
+- Fix impossible to open worktrees located in a subdirectory of a bare repo (#82)
+- When a merge is blocked by untracked files that would be overwritten, show an error message (instead of denying the merge silently)
+
+Maintenance:
+
+- Continued from the work started in v1.5.0, more operations now use "standard" Git instead of libgit2. This should be transparent to most users; others may benefit from better interoperability with their Git setup. (Reworked operations include: Workdir Status, Commit Diffs, Export Patch, Blame/Revlist, Register/Remove Submodule, New Repository, Add/Remove/Edit Remote, Restore files after stashing)
+- Some work on Windows compatibility (experimental)
+
 ## 1.5.0 (2025-09-08)
 
 **Major change: Better integration with standard Git tooling.** GitFourchette now uses git instead of libgit2 to edit repositories and communicate with remotes. This enables seamless integration into workflows that depend on OpenSSH, hooks, etc.
diff --git a/README.md b/README.md
@@ -44,5 +44,5 @@ GitFourchette is free—both as in beer and as in freedom. But if it helped you
 
 ## License
 
-GitFourchette © 2025 Iliyas Jorio.
+GitFourchette © 2026 Iliyas Jorio.
 Distributed under the terms of the [GNU General Public License v3](LICENSE).
diff --git a/gitfourchette/appconsts.py b/gitfourchette/appconsts.py
@@ -12,7 +12,7 @@ def _envBool(key: str) -> bool:
     return _os.environ.get(key, "") not in ["", "0"]
 
 
-APP_VERSION = "1.5.0"
+APP_VERSION = "1.6.0"
 APP_SYSTEM_NAME = "gitfourchette"
 APP_DISPLAY_NAME = "GitFourchette"
 APP_URL_SCHEME = APP_SYSTEM_NAME
diff --git a/gitfourchette/assets/contributors.txt b/gitfourchette/assets/contributors.txt
@@ -1,3 +1,5 @@
 Iliyas Jorio
 Lynn
+Neil Santos
+Tom Könecke
 Waldir Pimenta
diff --git a/gitfourchette/forms/aboutdialog.py b/gitfourchette/forms/aboutdialog.py
@@ -70,7 +70,7 @@ def __init__(self, parent):
         versionText = _("Version {0}", appVersion)
         self.ui.versionLabel.setText(dedent(f"""\
             <span style='color:{mutedTextColorHex(self)}'><b>{versionText}</b> {buildInfo}
-            <br>Copyright © 2025 Iliyas Jorio"""))
+            <br>Copyright © 2026 Iliyas Jorio"""))
 
         # ---------------------------------------------------------------------
         # About page
diff --git a/pkg/flatpak/org.gitfourchette.gitfourchette.metainfo.xml b/pkg/flatpak/org.gitfourchette.gitfourchette.metainfo.xml
@@ -66,6 +66,35 @@
   </keywords>
 
   <releases>
+    <release version="1.6.0" date="2026-02-01" type="stable">
+      <url>https://github.com/jorio/gitfourchette/releases/tag/v1.6.0</url>
+      <description>
+        <p>New features:</p>
+        <ul>
+        <li><em>Mount commits as folders.</em> This lets you browse the workdir at a specific point in time using your system's file manager. Available by right-clicking a commit in the Commit History. (FUSE 3 required + new optional dependency 'mfusepy')</li>
+        <li><em>Auto-fetch remotes periodically (experimental).</em> Enable this <em>Settings → Advanced → Auto-fetch remotes every N minutes.</em></li>
+        </ul>
+        <p>Quality of life improvements:</p>
+        <ul>
+        <li>FileList: Improve path readability by muting color of directory string (#77)</li>
+        <li>GraphView context menu: Show branch name instead of "Reset HEAD to Here" (#71)</li>
+        <li>GraphView context menu: Offer merging for any commit, not just branch tips (#74)</li>
+        <li>Image diffs: Ability to toggle between old/new images</li>
+        <li>Blame: Emphasize "new" lines with a different background color in the gutter</li>
+        <li>Allow pressing the Escape key to quickly close detached diff/blame windows</li>
+        </ul>
+        <p>Bug fixes:</p>
+        <ul>
+        <li>Fix impossible to open worktrees located in a subdirectory of a bare repo (#82)</li>
+        <li>When a merge is blocked by untracked files that would be overwritten, show an error message (instead of denying the merge silently)</li>
+        </ul>
+        <p>Maintenance:</p>
+        <ul>
+        <li>Continued from the work started in v1.5.0, more operations now use "standard" Git instead of libgit2. This should be transparent to most users; others may benefit from better interoperability with their Git setup. (Reworked operations include: Workdir Status, Commit Diffs, Export Patch, Blame/Revlist, Register/Remove Submodule, New Repository, Add/Remove/Edit Remote, Restore files after stashing)</li>
+        <li>Some work on Windows compatibility (experimental)</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.5.0" date="2025-09-08" type="stable">
       <url>https://github.com/jorio/gitfourchette/releases/tag/v1.5.0</url>
       <description>
