Skip to content
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 2 commits into from
Dec 16, 2014
Merged

Translate Git internals - maintenance #80

merged 2 commits into from
Dec 16, 2014

Conversation

madhead
Copy link
Contributor

@madhead madhead commented Dec 14, 2014

"Засталбливаю" перевод. Буду обновлять PR по мере перевода.

@sadfuzzy
Copy link
Member

Угу 👍

@madhead
Copy link
Contributor Author

madhead commented Dec 15, 2014

@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`, тем самым отказавшись от коммитов, которые затем понадобились.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

коммитов – фиксаций

@madhead
Copy link
Contributor Author

madhead commented Dec 15, 2014

@sadfuzzy, #36 (comment) ?

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.
@madhead
Copy link
Contributor Author

madhead commented Dec 15, 2014

@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
Copy link
Member

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
@sadfuzzy sadfuzzy merged commit 30f4d18 into progit:master Dec 16, 2014
@sadfuzzy
Copy link
Member

Супер! 👍

@sadfuzzy
Copy link
Member

Не переживай :)

@madhead madhead deleted the internals/maintenance branch January 15, 2015 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants