Undo changes in Git repository
You can always undo the changes you’ve made locally before you commit them:
In the Commit tool window Alt+0 , select one or more files that you want to revert, and select Rollback from the context menu, or press Ctrl+Alt+Z .
All changes made to the selected files since the last commit will be discarded, and they will disappear from the active changelist.
Unstage files
By default, PyCharm uses the changelists concept where modified files are staged automatically.
If a file is already under version control, and you do not want to commit it, you can:
Remove it from the commit: do not select it in the Changes area of the Commit tool window.
If you are more used to the staging concept, select the Enable staging area option in the Version Control | Git page of the IDE settings Ctrl+Alt+S .
Also, by default PyCharm suggests adding each newly created file under version control. You can change this behavior in Settings | Version Control | Confirmation using When files are created and When files are deleted settings respectively.
Undo the last commit
PyCharm allows you to undo the last commit in the current branch.
You cannot undo a commit if it was pushed to a protected branch, that is a branch to which force —push is not allowed (configure protected branches in the Version Control | Git page of the IDE settings Ctrl+Alt+S ) Note that if a branch is marked as protected on GitHub, PyCharm will automatically mark it as protected when you check it out.
Open the Git tool window Alt+9 and switch to the Log tab.
Select the last commit in the current branch and choose Undo Commit from the context menu.
In the dialog that opens, select a changelist where the changes you are going to discard will be moved. You can either select an existing changelist from the Name list, or specify the name of a new changelist (the commit message is used by default).
Select the Set active option if you want to make the changelist with the changes you are about to discard the active changelist.
Select the Track context option if you want PyCharm to remember your context and reload currently opened files in the editor when this changelist becomes active.
Revert a pushed commit
If you notice an error in a specific commit that has already been pushed, you can revert that commit. This operation results in a new commit that reverses the effect of the commit you want to undo. Thus, project history is preserved, as the original commit remains intact.
Locate the commit you want to revert in the Log tab of the Git tool window Alt+9 , right-click it and select Revert Commit from the context menu. This option is also available from the context menu of a commit in the file History view. The Commit Changes dialog will open with an automatically generated commit message.
If you apply this action to multiple commits selected in the Log view, a separate commit will be created to revert each of them.
If the selected commit contains several files, and you only need to revert some of them, deselect the files you do not want to touch.
Click Commit to commit a changeset that reverts the changes to the selected files in this particular commit.
Revert selected changes
PyCharm lets you undo selected changes from a pushed commit if this commit contains multiple files and you only need to revert some of them.
In the Log view select the commit containing the changes you want to discard.
In the Changed Files pane, right-click the file that you want to revert and select Revert Selected Changes from the context menu.
This results in a new commit that reverses the changes you want to undo.
Drop a commit
Unlike reverting a commit, which is reflected in the branch history, you can discard a pushed commit in the current branch without leaving any traces of the operation.
Like any operation that rewrites a branch history, dropping a commit requires a —force push and cannot be performed in protected branches (these can be configured in the Version Control | Git page of the IDE settings Ctrl+Alt+S .
Select a commit you want to discard in the Log view and choose Drop Commit from the context menu.
Reset a branch to a specific commit
If you notice an error in a set of recent commits and want to redo that part, you can roll back your repository to a specific state. This is done by resetting the current branch HEAD to a specified commit (and optionally resetting the index and working tree if you prefer not to reflect the undo in the history).
Open the Version Control tool window Alt+9 and switch to the Log tab.
Select the commit that you want to move HEAD onto and select Reset Current Branch to Here from the context menu.
In the Git Reset dialog that opens, select how you want your working tree and the index to be updated and click Reset :
Soft : all changes from commits that were made after the selected commit will be staged (that means they will be moved to the Local Changes view so that you can review them and commit later if necessary).
Mixed : changes made after the selected commit will be preserved but will not be staged for commit.
Hard : all changes made after the selected commit will be discarded (both staged and committed).
Keep : committed changes made after the selected commit will be discarded, but local changes will be kept intact.
Get a previous revision of a file
If you need to revert a single file instead of discarding a whole commit that includes changes to several files, you can return to a particular version of that file:
Select the required file in any view (in the Project tool window, in the editor, in the Local Changes view, and so on).
Select Git | Show History from the main VCS menu or from the context menu of the selection. The History tab is added to the Git tool window showing the history for the selected file and allowing you to review and compare its revisions.
When you’ve identified the revision you want to roll back to, select it in the list and choose Get from the context menu.
Как удалить git commit через pycharm
Через pycharm сделал коммит, понял, что случайно зацепил в коммит файл, которого не должно быть в коммите.
Попробовал исправить, создал еще пару новых коммитов.
Теперь хочу удалить все лишние коммиты, как это сделать через pycharm не используя консоль?
Коммиты еще не отправлены на сервер. Использую PyCharm 2016.3.1 и Debian 8
Ответы (3 шт):
Попробовал исправить, создал еще пару новых коммитов
Вы же разработчик, используйте консоль. Это интерпретатор языка программирования Bash. По мощности и функциональности превосходит GUI настолько же, насколько программирование клавиатурой превосходит программирование мышкой.
Найдите тот коммит, к которому нужно возвращаться (в котором был ненужный файл задет). Вам поможет
Посмотрите, какой коммит был перед этим. В логе нужно найти sha-1 этого предыдущего коммита. Выглядит как много букв и цифр, вроде a1ds23fef6rde. . Скопируйте в буфер или просто запомните первые несколько символов, их будет достаточно.
Теперь мы вернём ветку к предыдущему коммиту.
Теперь ваша ветка переставлена обратно на тот коммит, который был до инцидента. А в индексе уже добавлены все изменения из последующих коммитов.
«Забудьте» те изменения, которые не нужно включать в коммит с помощью
Обратите внимание, в этот раз reset без параметра —soft !
Теперь можно делать новый коммит.
Если оставшиеся изменения нужны, но ещё не готовы — просто продолжайте работу. Если же их нужно удалить, можно использовать эту команду:
PyCharm 2020.1, Windows 10
VCS — Git — Show history
В контекстном меню коммита «Undo Commit. «
в PyCharm внизу выбираешь 9:Git => Вкладка Log => нажимаешь на комит правой клавишей и выбираешь Undo commit => Ok
Undo Last Commit
You want to fix it, but you haven’t memorized the Git voodoo chant. Good news. If you haven’t pushed yet, the IDE can make this really easy.
First go to the Git tool window and make sure you’re on the log tab.
It shows the list of commits on the current branch. The most recent one is at the top.
Right-click that commit and in the pop-up window, choose Undo Commit.
That commit has some changes. Let’s keep them in the default changelist. Now the commit tool window says I have changes.
And now that commit…never happened. Let’s look a little deeper.
The Problem
You are editing, say a Markdown file. Let’s leave the Commit tool window and Git tool window open, to see the updates as we go.
You change the title, and make a commit. And for the thousandth consecutive time, you spot a typo, just as the onkeyup event fires when clicking commit. Alas, the commit tool window shows that there are no changes. And, in your Git log, there it is, the mistaken commit.
That means it’s too late, right! Nope, if you haven’t pushed to a “protected” branch, you can clean things up locally. And the IDE puts a convenient UI atop the underlying Git command.
The Solution
In the Git tool window, find the most recent commit. It’s the one at the top. When we select it, we get more detail about the commit. We can double-click the file to see a diff of the change.
When you right-click on a commit, you get some actions you can take on it. Some might be grayed-out. For example, if we right-click on an older, pushed commit, we’ll see “Undo Commit” is grayed-out.
Back to the first commit. Right-click on it, and select “Undo Commit”.
Now, the commit had some changes in them, and these changes need to go somewhere. The IDE’s changelists provide such a place. We’ll stick with the Default Changelist .
This results in our Commit tool window showing the changes when we click ok.
A look in the Git log also shows a change.
That commit is…gone! We’re back to where we were before the commit.
What would this have been like from the command line? Let’s take a look at the Git tool’s Console tab, to see behind the scenes. There it is, the command that we would have had to type, from the command line.
Как отменить коммит в pycharm
Когда мы изменяем код, вы можете встретить модифицированный код не так хорош, как код перед модификацией, то нам нужно будет свернуть код, давайте посмотрим, как посмотреть на Pycharm.
Сначала щелкните правой кнопкой мыши на бланке файла PY, нам нужно откатить назад, затем выберите локальную историю >> Показать историю на вкладке всплывающих окон, как показано:
Затем всплывающую диалоговое окно, показанное ниже, диалоговое окно содержит три столбца, левая сторона — это версия истории кода, средняя колонна — это историческая версия, выбранная в левой части, самый правый столбец является кодом. Текущий версия.
Откат кода необходим только для выбора версии, которую вы хотите отбросить в левом столбце, затем выберите REVERT в небольшом диалоге, который всплывает, как показано ниже:
Undo changes in Git repository
You can always undo the changes you’ve made locally before you commit them:
In the Commit tool window Alt+0 , select one or more files that you want to revert, and select Rollback from the context menu, or press Ctrl+Alt+Z .
All changes made to the selected files since the last commit will be discarded, and they will disappear from the active changelist.
Unstage files
By default, PyCharm uses the changelists concept where modified files are staged automatically.
If a file is already under version control, and you do not want to commit it, you can:
Remove it from the commit: do not select it in the Changes area of the Commit tool window.
If you are more used to the staging concept, select the Enable staging area option in the Version Control | Git page of the IDE settings Ctrl+Alt+S .
Also, by default PyCharm suggests adding each newly created file under version control. You can change this behavior in Settings/Preferences | Version Control | Confirmation using When files are created and When files are deleted settings respectively.
Undo the last commit
PyCharm allows you to undo the last commit in the current branch.
You cannot undo a commit if it was pushed to a protected branch, that is a branch to which force —push is not allowed (configure protected branches in the Version Control | Git page of the IDE settings Ctrl+Alt+S ) Note that if a branch is marked as protected on GitHub, PyCharm will automatically mark it as protected when you check it out.
Open the Git tool window Alt+9 and switch to the Log tab.
Select the last commit in the current branch and choose Undo Commit from the context menu.
In the dialog that opens, select a changelist where the changes you are going to discard will be moved. You can either select an existing changelist from the Name list, or specify the name of a new changelist (the commit message is used by default).
Select the Set active option if you want to make the changelist with the changes you are about to discard the active changelist.
Select the Track context option if you want PyCharm to remember your context and reload currently opened files in the editor when this changelist becomes active.
Revert a pushed commit
If you notice an error in a specific commit that has already been pushed, you can revert that commit. This operation results in a new commit that reverses the effect of the commit you want to undo. Thus, project history is preserved, as the original commit remains intact.
Locate the commit you want to revert in the Log tab of the Git tool window Alt+9 , right-click it and select Revert Commit from the context menu. This option is also available from the context menu of a commit in the file History view. The Commit Changes dialog will open with an automatically generated commit message.
If you apply this action to multiple commits selected in the Log view, a separate commit will be created to revert each of them.
If the selected commit contains several files, and you only need to revert some of them, deselect the files you do not want to touch.
Click Commit to commit a changeset that reverts the changes to the selected files in this particular commit.
Revert selected changes
PyCharm lets you undo selected changes from a pushed commit if this commit contains multiple files and you only need to revert some of them.
In the Log view select the commit containing the changes you want to discard.
In the Changed Files pane, right-click the file that you want to revert and select Revert Selected Changes from the context menu.
This results in a new commit that reverses the changes you want to undo.
Drop a commit
Unlike reverting a commit, which is reflected in the branch history, you can discard a pushed commit in the current branch without leaving any traces of the operation.
Like any operation that rewrites a branch history, dropping a commit requires a —force push and cannot be performed in protected branches (these can be configured in the Version Control | Git page of the IDE settings Ctrl+Alt+S .
Select a commit you want to discard in the Log view and choose Drop Commit from the context menu.
Reset a branch to a specific commit
If you notice an error in a set of recent commits and want to redo that part, you can roll back your repository to a specific state. This is done by resetting the current branch HEAD to a specified commit (and optionally resetting the index and working tree if you prefer not to reflect the undo in the history).
Open the Version Control tool window Alt+9 and switch to the Log tab.
Select the commit that you want to move HEAD onto and select Reset Current Branch to Here from the context menu.
In the Git Reset dialog that opens, select how you want your working tree and the index to be updated and click Reset :
Soft : all changes from commits that were made after the selected commit will be staged (that means they will be moved to the Local Changes view so that you can review them and commit later if necessary).
Mixed : changes made after the selected commit will be preserved but will not be staged for commit.
Hard : all changes made after the selected commit will be discarded (both staged and committed).
Keep : committed changes made after the selected commit will be discarded, but local changes will be kept intact.
Get a previous revision of a file
If you need to revert a single file instead of discarding a whole commit that includes changes to several files, you can return to a particular version of that file:
Select the required file in any view (in the Project tool window, in the editor, in the Local Changes view, and so on).
Select Git | Show History from the main VCS menu or from the context menu of the selection. The History tab is added to the Git tool window showing the history for the selected file and allowing you to review and compare its revisions.
When you’ve identified the revision you want to roll back to, select it in the list and choose Get from the context menu.
Как удалить git commit через pycharm
Через pycharm сделал коммит, понял, что случайно зацепил в коммит файл, которого не должно быть в коммите.
Попробовал исправить, создал еще пару новых коммитов.
Теперь хочу удалить все лишние коммиты, как это сделать через pycharm не используя консоль?
Коммиты еще не отправлены на сервер. Использую PyCharm 2016.3.1 и Debian 8
Ответы (3 шт):
Попробовал исправить, создал еще пару новых коммитов
Вы же разработчик, используйте консоль. Это интерпретатор языка программирования Bash. По мощности и функциональности превосходит GUI настолько же, насколько программирование клавиатурой превосходит программирование мышкой.
Найдите тот коммит, к которому нужно возвращаться (в котором был ненужный файл задет). Вам поможет
Посмотрите, какой коммит был перед этим. В логе нужно найти sha-1 этого предыдущего коммита. Выглядит как много букв и цифр, вроде a1ds23fef6rde. . Скопируйте в буфер или просто запомните первые несколько символов, их будет достаточно.
Теперь мы вернём ветку к предыдущему коммиту.
Теперь ваша ветка переставлена обратно на тот коммит, который был до инцидента. А в индексе уже добавлены все изменения из последующих коммитов.
«Забудьте» те изменения, которые не нужно включать в коммит с помощью
Обратите внимание, в этот раз reset без параметра —soft !
Теперь можно делать новый коммит.
Если оставшиеся изменения нужны, но ещё не готовы — просто продолжайте работу. Если же их нужно удалить, можно использовать эту команду:
PyCharm 2020.1, Windows 10
VCS — Git — Show history
В контекстном меню коммита «Undo Commit. «
в PyCharm внизу выбираешь 9:Git => Вкладка Log => нажимаешь на комит правой клавишей и выбираешь Undo commit => Ok
PyCharm how to delete a git branch locally and remotely
Deleting a git branch from GitHub or BitBucket can be done in two ways with PyCharm / IntelliJ:
- by terminal
- by UI
More info about managing branches with PyCharm / IntelliJ:
Delete git branch by terminal — locally and remotely
How to delete local branch in PyCharm by using the terminal:
how to delete remote branch in PyCharm:
-d
—delete
Delete a branch. The branch must be fully merged in its upstream branch, or in HEAD if no upstream was set with —track or —set-upstream-to.
Finally the change can be propagated on other machines by:
git-fetch — Download objects and refs from another repository
—all
Fetch all remotes.
Delete git branch by GUI — locally and remotely
If you are not confident with the terminal commands you can follow the next steps:
- Open the PyCharm project where you want to delete the branch
- Update the project with latest updates (optional)
- VCS
- Git
- Pull ( You can do also fetch in order to get all branch changes)
- Go to branches
- Change the selected branch to another one(you cannot delete a branch if you are using it)
- Select the local branch that you want to delete
- Show context menu
- Delete
- Go to branches
- Select the remote branch that you want to delete (again you need to have more than one branch in order to delete it)
- Show context menu
- Delete
- Finally you need to push the changes to the server
- VCS
- Git
- Push
Note: In order to propagate the changes to other machines you will need to fetch the changes by:
* VCS
* Git
* Fecth