diff --git a/CHANGELOG.md b/CHANGELOG.md index c488016..c7f5119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # GitNoob changelog +## Version 1.24 +* Add: create a new branch on a specific commit-id. +* Add: edit GitNoob project configuration file. +* Fix: automatic create temporary commit, if necessary, when changing branch. +* Fix: php.exe already present in Windows global path. + ## Version 1.23 * Add: option to start DOS Prompt when a merge, rebase, cherry pick conflict arises. * Add: Edit GitNoob root configuration file. diff --git a/README.md b/README.md index b00051c..0784ed0 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ GitNoob solves the following problems: - Deleting a branch. With the safety first feature to also undelete the deleted branch. - Flushing all your current changes down the toilet. To be able to start over, continue with a clean slate. - When having committed to the wrong branch (e.g. the main branch) provide a remedy to move the commits to a new branch. -- Prevent git disaster from happening when: in detached head state, inside rebase, inside merge, having working tree changes, having staged uncommitted files. +- Prevent git disaster from happening when: in detached head state, inside rebase, inside merge, inside cherry-picking, inside reverting, having working tree changes, having staged uncommitted files. - When using [Git Credentials via KeePassCommander](https://github.com/MircoBabin/GitCredentialsViaKeePassCommander) ensure KeePass is started. - Starting a dosprompt. Also with the "as administrator" option. - Starting an explorer. diff --git a/assets/Release/GitNoob-1.23.zip b/assets/Release/GitNoob-1.23.zip deleted file mode 100644 index 468c371..0000000 Binary files a/assets/Release/GitNoob-1.23.zip and /dev/null differ diff --git a/assets/Release/GitNoob-1.23-debugpack.zip b/assets/Release/GitNoob-1.24-debugpack.zip similarity index 54% rename from assets/Release/GitNoob-1.23-debugpack.zip rename to assets/Release/GitNoob-1.24-debugpack.zip index 5d5ed91..1872831 100644 Binary files a/assets/Release/GitNoob-1.23-debugpack.zip and b/assets/Release/GitNoob-1.24-debugpack.zip differ diff --git a/assets/Release/GitNoob-1.24.zip b/assets/Release/GitNoob-1.24.zip new file mode 100644 index 0000000..4d35df9 Binary files /dev/null and b/assets/Release/GitNoob-1.24.zip differ diff --git a/assets/Release/release.download.zip.url-location b/assets/Release/release.download.zip.url-location index fd74893..868c4f2 100644 --- a/assets/Release/release.download.zip.url-location +++ b/assets/Release/release.download.zip.url-location @@ -1 +1 @@ -https://github.com/MircoBabin/GitNoob/releases/download/1.23/GitNoob-1.23.zip \ No newline at end of file +https://github.com/MircoBabin/GitNoob/releases/download/1.24/GitNoob-1.24.zip \ No newline at end of file diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs index 7af49e2..6c195b1 100644 --- a/src/GlobalAssemblyInfo.cs +++ b/src/GlobalAssemblyInfo.cs @@ -22,5 +22,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.23")] -[assembly: AssemblyFileVersion("1.23")] +[assembly: AssemblyVersion("1.24")] +[assembly: AssemblyFileVersion("1.24")]