Merge branch 'Murmele:master' into close-branches-after-checkout

.github/workflows/build.yml

@@ -73,12 +73,6 @@ jobs:
         owner: 'flathub'
         repository: 'com.github.Murmele.Gittyup'
 
-    # just until the new release is out
-    - name: Checkout restructureCMake
-      run: |
-        cd com.github.Murmele.Gittyup
-        git checkout restructureCMake
-
     - name: Replace git tag by the commit id on which it runs
       if: github.ref_type != 'tag'
       run: >

.gitignore

@@ -3,3 +3,6 @@ build
 .project
 .vscode/
 CMakeLists.txt.user
+cmake-build-debug/
+cmake-build-release/
+.idea/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6.2)
+cmake_minimum_required(VERSION 3.12)
 project(Gittyup)
 
 # Set name and version.
@@ -6,8 +6,8 @@ set(GITTYUP_NAME "Gittyup")
 set(GITTYUP_EXECUTABLE_NAME "gittyup")
 set(GITTYUP_IDENTIFIER "com.github.Murmele.Gittyup")
 set(GITTYUP_VERSION_MAJOR 1)
-set(GITTYUP_VERSION_MINOR 2)
-set(GITTYUP_VERSION_PATCH 2)
+set(GITTYUP_VERSION_MINOR 3)
+set(GITTYUP_VERSION_PATCH 0)
 set(GITTYUP_VERSION
     "${GITTYUP_VERSION_MAJOR}.${GITTYUP_VERSION_MINOR}.${GITTYUP_VERSION_PATCH}"
 )

docs/changelog.md

@@ -1,6 +1,6 @@
-### v9.9.9 - 2023-01-22
+### v1.3.0 - 2023-04-20
 
-Current unreleased version
+Performance Improvement and feature release
 
 #### Added
 
@@ -11,10 +11,14 @@ Current unreleased version
 
 #### Changed
 
-* Fix external diff with Flatpak
+* Fix external diff in Flatpak build
+* Fix windows credentials
+* Fix force push to correct remote
+* Fix tab title if more than three times a repository with the same name is opened
 * Fix storing repository settings correctly, because otherwise they are not applied
 * Fix language support
 * Improved refresh velocity
+* Fix storing and restoring current opened file when Gittyup refreshes
 * Improved velocity for files with many hunks
 
 ----