git_ex1/AlexeyMihaylovDev #24
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alonitac
reviewed
Oct 23, 2022
| 5.blue | ||
| 6.git diff main | ||
| 7. because i didn't stages (git add "files") files after last commit | ||
| 8. stage2 is fail argument |
Owner
There was a problem hiding this comment.
It's a valid argument, but there is no branch called stage2
alonitac
reviewed
Oct 23, 2022
| 14. first time we see abc.txt after commited (green) | ||
| second time we see abc.txt working tree (red) | ||
|
|
||
| --------------------Resolve conflicts---------------- |
alonitac
reviewed
Oct 23, 2022
|
|
||
| 6. Yes - we have commits Marge branch | ||
|
|
||
| --------------------------cherry-pick------------------- |
alonitac
reviewed
Oct 23, 2022
| 6. No , remove my changes in indexing and working tree | ||
|
|
||
| ------------------------Reset----------------------- | ||
| 2.1 git reset --soft HEAD~1 - remove the last commit from the current branch, but the file changes will stay in your working tree |
Owner
There was a problem hiding this comment.
and it stays in the index as well
alonitac
reviewed
Oct 23, 2022
|
|
||
| 2.4 git revert HEAD~1 - If you have already made your commits public, you will want to create a new commit which will "revert" the changes you made in "one" commits before HEAD. | ||
|
|
||
| 3. HEAD~1 means that you want to reset the HEAD (the last commit) to one commit before in the log history. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git_ex1 from alexeymihaylovdev