-
Notifications
You must be signed in to change notification settings - Fork 136
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Translate Git internals - maintenance #80
Merged
Merged
Conversation
This file contains 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
Угу 👍 |
@sadfuzzy, ревьювните пожалуйста! |
Generally, this happens because you force-delete a branch that had work on it, and it turns out you wanted the branch after all; or you hard-reset a branch, thus abandoning commits that you wanted something from. | ||
Assuming this happens, how can you get your commits back? | ||
В какой-то момент при работе с Git вы можете нечаянно потерять коммит. | ||
Как правило, такое случается, когда вы удаляете ветку, в которой находились некоторые наработки, а потом оказывается, что они всё-таки были нужными; либо вы выполнили `git reset --hard`, тем самым отказавшись от коммитов, которые затем понадобились. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
коммитов – фиксаций
Sorry, guys, I was forced to make this change in order the branch to be merged. I do not really think that using word "фиксация" makes the translation more clear and understandable. Also I do not think it makes the text "more russian". Feel free to revert this change as soon as readership feedback arrive.
@sadfuzzy, обновил текст :( |
In this case, you can see your missing commit after the string ``dangling commit''. | ||
You can recover it the same way, by adding a branch that points to that SHA. | ||
В данном случае потерянный коммит указан после слов "dangling commit" ("висячий" коммит). | ||
Его можно восстановить аналогичным образом, добавив ветку, указывающую на этот SHA. | ||
|
||
[[_removing_objects]] | ||
==== Removing Objects |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Удаление объектов
sadfuzzy
added a commit
that referenced
this pull request
Dec 16, 2014
Translate Git internals - maintenance
Супер! 👍 |
Не переживай :) |
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.
"Засталбливаю" перевод. Буду обновлять PR по мере перевода.