Compare commits
2 Commits
04507b8fc3
...
3d101f5456
Author | SHA1 | Date |
---|---|---|
ericfeunekes | 3d101f5456 | |
RuiSiang | a8897df82d |
55
README.md
55
README.md
|
@ -1,7 +1,7 @@
|
|||
# Flight rules for Git
|
||||
|
||||
🌍
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [简体中文](README_zh-CN.md)∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [繁體中文](README_zh-TW.md) ∙ [简体中文](README_zh-CN.md) ∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
|
||||
#### What are "flight rules"?
|
||||
|
||||
|
@ -37,6 +37,7 @@ All commands should work for at least git version 2.13.0. See the [git website](
|
|||
- [I wrote the wrong thing in a commit message](#i-wrote-the-wrong-thing-in-a-commit-message)
|
||||
- [I committed with the wrong name and email configured](#i-committed-with-the-wrong-name-and-email-configured)
|
||||
- [I want to remove a file from the previous commit](#i-want-to-remove-a-file-from-the-previous-commit)
|
||||
- [I want to move a change from one commit to another](#i-want-to-move-a-change-from-one-commit-to-another)
|
||||
- [I want to delete or remove my last commit](#i-want-to-delete-or-remove-my-last-commit)
|
||||
- [Delete/remove arbitrary commit](#deleteremove-arbitrary-commit)
|
||||
- [I tried to push my amended commit to a remote, but I got an error message](#i-tried-to-push-my-amended-commit-to-a-remote-but-i-got-an-error-message)
|
||||
|
@ -348,6 +349,58 @@ $ git commit --amend --no-edit
|
|||
|
||||
This is particularly useful when you have an open patch and you have committed an unnecessary file, and need to force push to update the patch on a remote. The `--no-edit` option is used to keep the existing commit message.
|
||||
|
||||
<a name="move-change-to-new-commit"></a>
|
||||
### I want to move a change from one commit to another
|
||||
If you've made a commit that includes changes that would fit better in another commit, you can move the changes to the other commit using an interactive rebase. This comes from [stackoverflow](https://stackoverflow.com/a/54985304/2491502).
|
||||
|
||||
For example, you have three commits (a, b, c). On b, you've changes file1 and file2 and you want to move the change on file1 from commit b to commit a.
|
||||
|
||||
First, rebase interactively:
|
||||
|
||||
```sh
|
||||
$ git rebase -i HEAD~3
|
||||
```
|
||||
|
||||
This will open an editor with the following:
|
||||
|
||||
```sh
|
||||
pick a
|
||||
pick b
|
||||
pick c
|
||||
```
|
||||
|
||||
Change the lines with a and b to edit:
|
||||
|
||||
```sh
|
||||
edit a
|
||||
edit b
|
||||
pick c
|
||||
```
|
||||
|
||||
Save and close the editor. This will bring you to commit b. Now, reset the file1 changes:
|
||||
|
||||
```sh
|
||||
$ git reset HEAD~1 file1
|
||||
```
|
||||
|
||||
This will unstage the changes in file1. Now, stash those changes and continue the rebase:
|
||||
|
||||
```sh
|
||||
$ git stash
|
||||
$ git rebase --continue
|
||||
```
|
||||
|
||||
Now you will be editing commit a. Unstash the changes then add them to the current commit and continue the rebase:
|
||||
|
||||
```sh
|
||||
$ git stash pop
|
||||
$ git add file1
|
||||
$ git commit --amend --no-edit
|
||||
$ git rebase --continue
|
||||
```
|
||||
|
||||
Now your rebase is complete, with the changes from b on a. If you wanted to move the changes from b to c, you would have to do two rebases since c comes before b: one to get the changes out of b, then another to edit c and add the stashed changes.
|
||||
|
||||
<a name="delete-pushed-commit"></a>
|
||||
### I want to delete or remove my last commit
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Reglas de vuelo para git
|
||||
|
||||
🌍
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [简体中文](README_zh-CN.md)∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [繁體中文](README_zh-TW.md) ∙ [简体中文](README_zh-CN.md) ∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
|
||||
#### ¿Qué son "reglas de vuelo"?
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Règles de vol pour Git
|
||||
|
||||
🌍
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [简体中文](README_zh-CN.md)∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [繁體中文](README_zh-TW.md) ∙ [简体中文](README_zh-CN.md) ∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
|
||||
#### C'est quoi des "règles de vol" ?
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Git フライトルール
|
||||
|
||||
🌍
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [简体中文](README_zh-CN.md)∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [繁體中文](README_zh-TW.md) ∙ [简体中文](README_zh-CN.md) ∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
|
||||
#### フライトルールとは?
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# 깃을 위한 flight rules
|
||||
|
||||
🌍
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [简体中文](README_zh-CN.md)∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [繁體中文](README_zh-TW.md) ∙ [简体中文](README_zh-CN.md) ∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
|
||||
#### flight rules 가 뭐야?
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Правила полета на Git
|
||||
|
||||
🌍
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [简体中文](README_zh-CN.md)∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [繁體中文](README_zh-TW.md) ∙ [简体中文](README_zh-CN.md) ∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
|
||||
#### Что это за "правила полета" такие?
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Flight rules cho Git
|
||||
|
||||
🌍
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [简体中文](README_zh-CN.md)∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [繁體中文](README_zh-TW.md) ∙ [简体中文](README_zh-CN.md) ∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
|
||||
#### "Flight rules" là gì?
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Git飞行规则(Flight Rules)
|
||||
|
||||
🌍
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [简体中文](README_zh-CN.md)∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
*[English](README.md) ∙ [Español](README_es.md) ∙ [Русский](README_ru.md) ∙ [繁體中文](README_zh-TW.md) ∙ [简体中文](README_zh-CN.md) ∙ [한국어](README_kr.md) ∙ [Tiếng Việt](README_vi.md) ∙ [Français](README_fr.md) ∙ [日本語](README_ja.md)*
|
||||
|
||||
#### 前言
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue