You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: CONTRIBUTE.md
+2-2
Original file line number
Diff line number
Diff line change
@@ -33,14 +33,14 @@ We use a translation tool called [GitLocalize][gl]. Please follow these steps to
33
33
34
34
1. Go to [GitLocalize's k88hudson/git-flight-rules repository][gl-repo].
35
35
1. Sign up using your GitHub account :octocat:.
36
-
1. Find the document you are going to translate.
36
+
1. Find the document you are going to translate.
37
37
1. Happy translating :sparkles: .
38
38
1. When you are done, send the translation for reviews.
39
39
1. The reviewed translation will be sent as a Pull Request to GitHub by the language moderator in the community.
40
40
41
41
To learn more about how GitLocalize works, visit their [help page][gl-help]. If you find any issues or feature requests, please file them in [GitLocalize's issue tracker][gl-issue-tracker].
### I want to stage my unstaged edits, and unstage my staged edits
302
298
@@ -459,7 +455,6 @@ $ git branch -a
459
455
$ git checkout -b <branch><SHA1_OF_COMMIT>
460
456
```
461
457
462
-
463
458
<aname="pull-wrong-branch"></a>
464
459
### I pulled from/into the wrong branch
465
460
@@ -622,7 +617,6 @@ Now, let's *cherry-pick* the commit for bug #21 on top of our branch. That means
622
617
623
618
At this point, there is a possibility there might be conflicts. See the [**There were conflicts**](#merge-conflict) section in the [interactive rebasing section above](#interactive-rebase) for how to resolve conflicts.
624
619
625
-
626
620
Now let's create a new branch for bug #14, also based on master
627
621
628
622
```sh
@@ -637,7 +631,6 @@ And finally, let's cherry-pick the commit for bug #14:
637
631
(14)$ git cherry-pick 5ea5173
638
632
```
639
633
640
-
641
634
<aname="delete-stale-local-branches"></a>
642
635
### I want to delete local branches that were deleted upstream
643
636
Once you merge a pull request on GitHub, it gives you the option to delete the merged branch in your fork. If you aren't planning to keep working on the branch, it's cleaner to delete the local copies of the branch so you don't end up cluttering up your working checkout with a lot of stale branches.
@@ -1182,7 +1175,6 @@ Keep in mind that author and committer are not the same. The `--author` is the p
1182
1175
1183
1176
To find all commits containing a specific file you can use:
1184
1177
1185
-
1186
1178
```sh
1187
1179
$ git log -- <path to file>
1188
1180
```
@@ -1438,7 +1430,6 @@ Using `git reset` it is then possible to change master back to the commit it was
1438
1430
1439
1431
(copied and edited from [Source](https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog)).
### Я хочу подготовить свои неподготовленные правки и убрать из подготовки то, что уже подготовлено
299
295
@@ -456,7 +452,6 @@ $ git branch -a
456
452
$ git checkout -b <branch><SHA1_OF_COMMIT>
457
453
```
458
454
459
-
460
455
<aname="pull-wrong-branch"></a>
461
456
### Я стянул изменения (pull) из неправильной ветки или в неправильную ветку
462
457
@@ -619,7 +614,6 @@ HEAD is now at a13b85e
619
614
620
615
На этом этапе есть вероятность конфликтов. О том как разрешить конфликты см. в главе [**Здесь были конфликты**](#merge-conflict) в [разделе интерактивное перебазирование выше](#interactive-rebase).
621
616
622
-
623
617
Теперь давайте создадим новую ветку для бага #14, которая также основана на master
624
618
625
619
```sh
@@ -634,7 +628,6 @@ HEAD is now at a13b85e
634
628
(14)$ git cherry-pick 5ea5173
635
629
```
636
630
637
-
638
631
<aname="delete-stale-local-branches"></a>
639
632
### Я хочу удалить локальные ветки, которые были удалены в upstream
640
633
Как только Вы слили пулл-реквест на GitHub, Вам предлагают удалить слитую ветку из Вашего форка. Если Вы не планируете продолжать работу в этой ветке, то для поддержания рабочей копии в чистоте Вы можете удалить локальные копии ненужных веток, чтобы не путаться в них.
@@ -1395,7 +1388,6 @@ $ git reset --hard 0254ea7
1395
1388
1396
1389
(взято из [Источник](https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog)).
0 commit comments