Release V1.2.0

Merge pull request #272 from Murmele/gittyup_1.1.3

CMakeLists.txt

@@ -4,8 +4,8 @@ project(Gittyup)
 # Set name and version.
 set(GITTYUP_NAME "Gittyup")
 set(GITTYUP_VERSION_MAJOR 1)
-set(GITTYUP_VERSION_MINOR 1)
-set(GITTYUP_VERSION_PATCH 1)
+set(GITTYUP_VERSION_MINOR 2)
+set(GITTYUP_VERSION_PATCH 0)
 set(GITTYUP_VERSION
     "${GITTYUP_VERSION_MAJOR}.${GITTYUP_VERSION_MINOR}.${GITTYUP_VERSION_PATCH}"
 )

README.md

@@ -156,7 +156,7 @@ Install `gittyup-git` for the VCS build.
 
 **Homebrew**
 
-Install the `gittyup` cask from [Homebrew](https://brew.sh/).
+Install the `gittyup` cask from [Homebrew](https://formulae.brew.sh/cask/gittyup).
 
     brew install gittyup
 

docs/changelog.md

@@ -1,52 +1,91 @@
-### v1.1.1 - 2022-06-09
-
-Bug fix release
-
-#### Added
-* Distinguish between commit author and committer
-* Show image preview also for deleted files
-* Official macOS release
-* Show which kind of merge conflict occurred for each conflict
-
-#### Changed
-* Fix single line staging if not all hunks are loaded
-* Fix cherrypick commit author
-* Fix segmentation fault if submodule update fails
-* Fix line staging with windows new lines
-* Show first change in the diff view when loading
-* Improved windows icon
-
-----
-
-### v1.1.0 - 2022-04-30
-
-Second release of Gittyup
-
-#### Added
-* Button to directly access the terminal and the filebrowser
-* Add support for running in single instance mode
-* Customizable hotkeys
-* Quick commit author overriding
-* keyboard-interactive SSH auth
-* Improved single line staging and replacing staging image to a more appropriate one
-* Font customizing
-* Options to switch between staging/unstaging treeview, single tree view and list view
-* Do not automatically abort rebase if conflicts occur
-* Add possibility to save file of any version on local system
-* Add possibility to open a file of any version with default editor
-
-----
-
-### v1.0.0 - 2021-11-18
-
-First version of the GitAhead Fork Gittyup
-
-#### Added
-* Staging of single lines
-* Double tree view: Seeing staged and unstaged changes in different trees.
-* Maximize History or Diff view by pressing Ctrl+M
-* Ignore Pattern: Ability to ignore all files defined by a pattern instead of only one file
-* Tag Viewer: When creating a new tag all available tags are visible. Makes it easier to create consistent tags.
-* Commit Message template: Making it easier to write template based commit messages.
-
-----
+### v1.2.0 - 2022-10-28
+
+Bug fix and feature release
+
+#### Added
+* Add support for solving merge conflicts for whole files
+* Solving binary conflicts directly in Gittyup
+* Support rebasing with conflict solving
+* Implement amending commits
+* Possibility to init submodules after clone (Settings - General - Update submodules after pull and clone)
+* Hiding menu bar (Application Settings - Window - Hide Menubar)
+* Implement support for Gitea instances
+
+#### Changed
+* Fix Segmentation fault when using space to stage files
+* Fix menubar color in dark theme
+* Filter only branches, tags, remotes attached to selected commit
+* Fix crash when global GIT config is invalid
+* Fix crash when having errors while adding a remote account
+* Fix updater on windows, macos and linux (flatpak)
+* Fix discarding file leading to discarding submodule changes
+* Fix rebase log messages during rebase
+* Improve SSH config handling
+* Application settings and repository settings can now be selected with a single settings button
+* Use the full file context menu for the staging file list
+* Fix Arch Linux build
+
+----
+
+### v1.1.2 - 2022-08-12
+
+Bug fix release
+
+#### Changed
+
+* Fix bundled OpenSSL version incompatibility
+
+----
+
+### v1.1.1 - 2022-06-09
+
+Bug fix release
+
+#### Added
+* Distinguish between commit author and committer
+* Show image preview also for deleted files
+* Official macOS release
+* Show which kind of merge conflict occurred for each conflict
+
+#### Changed
+* Fix single line staging if not all hunks are loaded
+* Fix cherrypick commit author
+* Fix segmentation fault if submodule update fails
+* Fix line staging with windows new lines
+* Show first change in the diff view when loading
+* Improved windows icon
+
+----
+
+### v1.1.0 - 2022-04-30
+
+Second release of Gittyup
+
+#### Added
+* Button to directly access the terminal and the filebrowser
+* Add support for running in single instance mode
+* Customizable hotkeys
+* Quick commit author overriding
+* keyboard-interactive SSH auth
+* Improved single line staging and replacing staging image to a more appropriate one
+* Font customizing
+* Options to switch between staging/unstaging treeview, single tree view and list view
+* Do not automatically abort rebase if conflicts occur
+* Add possibility to save file of any version on local system
+* Add possibility to open a file of any version with default editor
+
+----
+
+### v1.0.0 - 2021-11-18
+
+First version of the GitAhead Fork Gittyup
+
+#### Added
+* Staging of single lines
+* Double tree view: Seeing staged and unstaged changes in different trees.
+* Maximize History or Diff view by pressing Ctrl+M
+* Ignore Pattern: Ability to ignore all files defined by a pattern instead of only one file
+* Tag Viewer: When creating a new tag all available tags are visible. Makes it easier to create consistent tags.
+* Commit Message template: Making it easier to write template based commit messages.
+
+----

docs/index.md

@@ -40,13 +40,39 @@ Features
 Select "Show Selected Branch" in the drop down menu above the commit list
 ![Single branch](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/main_show_selected_branch.png)
 
+### Fullscreen
+of the history or the change dialog by pressing Ctrl+M
+
+### Tabs
+to be able to switch fast between repositories
+
+### Diff View
+Staging and unstaging changes, viewing Blame
+![Diff View](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/DiffView.png)
+
+### Tree View
+To visit the blame with its history for unchanged files
+
+![Tree View](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/treeview.png)
+
+### Blame View
+See blame of the current version with an integrated timeline to see who changed which line
+
+![Blame View](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/BlameView.png)
+
 ### Single line staging 
 by eighter clicking on the checkboxes next to each line or by selecting the relevant code and pressing "S". For unstaging you can uncheck the checkboxes or press "U". To revert changes, select the text and press "R".
 
 ![Single line staging](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/double_treeview_single_line_staging.png)
 
-### Fullscreen
-of the history or the change dialog by pressing Ctrl+M
+### Amending commits
+Editing properties of a commit
+![Amend Dialog](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/AmendDialog.png)
+
+### Solving rebase conflicts
+Solving rebase conflicts and continuouing after conflicts are solved
+
+![Rebase Conflicts](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/RebaseConflicts.png)
 
 ### Staring commits
 to find specific commits much faster
@@ -57,24 +83,13 @@ Use an existing tag as template for your next tag. So you never have to look whi
 
 ![Tag selection](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/tag_selection.png)
 
-### Tree View
-To visit the blame with its history for unchanged files
-
-![Tree View](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/treeview.png)
-
-### Blame View
-See blame of the current version with an integrated timeline to see who changed which line
-
 ### Commit message template
 Create you commit messages according a defined template
 
 ![Commit message template selection](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/CommitMessageTemplateSelection.png)
 
 ![Commit message template editor](https://raw.githubusercontent.com/Murmele/Gittyup/master/rsrc/screenshots/CommitMessageTemplateEditor.png)
 
-### Tabs
-to be able to switch fast between repositories
-
 ### And a lot more ...
 
 Changelog