mirror of
https://github.com/k88hudson/git-flight-rules.git
synced 2025-03-10 12:48:43 -03:00
Edits: changes in specific file between commits/branches (#346)
This commit is contained in:
parent
c34b49ff5a
commit
18c656604b
@ -1829,12 +1829,16 @@ Assuming you want to compare last commit with file from commit c5f567:
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
||||||
|
# or
|
||||||
|
$ git diff HEAD c5f567 -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
Same goes for branches:
|
If you are going to compare changes between the tips of the `main` and the `staging` branches:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff main:path_to_file/file staging:path_to_file/file
|
$ git diff main:path_to_file/file staging:path_to_file/file
|
||||||
|
# or
|
||||||
|
$ git diff main staging -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
### I want Git to ignore changes to a specific file
|
### I want Git to ignore changes to a specific file
|
||||||
|
@ -1450,12 +1450,16 @@ Supposons que vous voulez comparer le dernier commit avec le fichier du commit `
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
||||||
|
# ou
|
||||||
|
$ git diff HEAD c5f567 -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
Il en est de même pour les branches :
|
Il en est de même pour les branches :
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff main:path_to_file/file staging:path_to_file/file
|
$ git diff main:path_to_file/file staging:path_to_file/file
|
||||||
|
# ou
|
||||||
|
$ git diff main staging -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
### Je veux que Git ignore les changements d'un fichier spécifique
|
### Je veux que Git ignore les changements d'un fichier spécifique
|
||||||
|
@ -1873,12 +1873,16 @@ $ git push origin refs/tags/<tag-name>
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
||||||
|
# または
|
||||||
|
$ git diff HEAD c5f567 -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
ブランチでも同様です。
|
ブランチでも同様です。
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff main:path_to_file/file staging:path_to_file/file
|
$ git diff main:path_to_file/file staging:path_to_file/file
|
||||||
|
# または
|
||||||
|
$ git diff main staging -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
### 特定のファイルの変更を無視したい
|
### 特定のファイルの変更を無視したい
|
||||||
|
@ -1409,12 +1409,16 @@ c5f567 한 단계전으로 복구하고 싶다면, c5f567~1로 적어줘요:
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
||||||
|
# 아니면 짧게:
|
||||||
|
$ git diff HEAD c5f567 -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
브랜치도 같은 방법으로:
|
브랜치도 같은 방법으로:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff main:path_to_file/file staging:path_to_file/file
|
$ git diff main:path_to_file/file staging:path_to_file/file
|
||||||
|
# 아니면 짧게:
|
||||||
|
$ git diff main staging -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
## 설정
|
## 설정
|
||||||
|
@ -1681,12 +1681,16 @@ $ git push origin refs/tags/<tag-name>
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
||||||
|
# или
|
||||||
|
$ git diff HEAD c5f567 -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
Аналогично для веток:
|
Аналогично для веток:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff main:path_to_file/file staging:path_to_file/file
|
$ git diff main:path_to_file/file staging:path_to_file/file
|
||||||
|
# или
|
||||||
|
$ git diff main staging -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
### Я хочу, чтобы Git игнорировал изменения в определенном файле
|
### Я хочу, чтобы Git игнорировал изменения в определенном файле
|
||||||
|
@ -1776,12 +1776,16 @@ Giả sử bạn muốn so sánh commit cuối cùng với tệp từ commit c5f
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
$ git diff HEAD:path_to_file/file c5f567:path_to_file/file
|
||||||
|
# hoặc
|
||||||
|
$ git diff HEAD c5f567 -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
Cũng giống khi so sánh nhánh nhánh:
|
Cũng giống khi so sánh nhánh nhánh:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ git diff main:path_to_file/file staging:path_to_file/file
|
$ git diff main:path_to_file/file staging:path_to_file/file
|
||||||
|
# hoặc
|
||||||
|
$ git diff main staging -- path_to_file/file
|
||||||
```
|
```
|
||||||
|
|
||||||
### Tôi muốn Git bỏ qua những thay đổi đối với một tệp cụ thể
|
### Tôi muốn Git bỏ qua những thay đổi đối với một tệp cụ thể
|
||||||
|
Loading…
x
Reference in New Issue
Block a user