git如何合并单个文件_GIT 如何从另一分支合并特定的文件

F:\Test>git init #初始化

Initialized empty Git repository in F:/Test/.git/

F:\Test>git add . #添加文件

F:\Test>git commit -m 'init' #提交

[master (root-commit) 0b9520a] 'init'

2 files changed, 4 insertions(+)

create mode 100644 dev.txt

create mode 100644 test.txt

F:\Test>git checkout -b dev --新建并切换分支

Switched to a new branch 'dev'

F:\Test>git diff #更改文件，比较文件差异

WARNING: terminal is not fully functional

diff --git a/dev.txt b/dev.txt

index d62bb90..a21f2e9 100644

--- a/dev.txt

+++ b/dev.txt

@@ -1,2 +1,5 @@

init

-dev-edit

\ No newline at end of file

+dev-edit

+

+

+dev-edit-2015-08-05

\ No newline at end of file

F:\Test>git commit -a -m 'edit-dev' #提交

[dev 9f224fd] 'edit-dev'

1 file changed, 4 insertions(+), 1 deletion(-)

F:\Test>git checkout master #切换到主分支

Switched to branch 'master'

F:\Test>git diff #更改文件，并对比差异

WARNING: terminal is not fully functional

diff --git a/dev.txt b/dev.txt

index d62bb90..719fd72 100644

--- a/dev.txt

+++ b/dev.txt

@@ -1,2 +1,4 @@

init

-dev-edit

\ No newline at end of file

+dev-edit

+

+edt-master-2018-08-05

\ No newline at end of file

F:\Test>git commit -a -m 'edit-master-dev' #提交并保存已更改的文件

[master dbeec1c] 'edit-master-dev'

1 file changed, 3 insertions(+), 1 deletion(-)

F:\Test>git status

On branch master

nothing to commit, working directory clean

F:\Test>git checkout dev dev.txt #在master中合并 并覆盖dev分支中的dev.txt文件

F:\Test>git status #当前master分支状态，因为dev.txt是直接从dev分支直接覆盖而来，所以可能需要手动合并冲突

On branch master

Changes to be committed:

(use "git reset HEAD..." to unstage)

modified: dev.txt

F:\Test>git diff

WARNING: terminal is not fully functional

- (press RETURN)

F:\Test>

F:\Test>git diff dev.txt #查看dev.txt跟当前分支的差异,因为已经提交到暂存区,所以这里没有显示出差异

WARNING: terminal is not fully functional

- (press RETURN)

F:\Test>git status

On branch master

Changes to be committed:

(use "git reset HEAD..." to unstage)

modified: dev.txt

F:\Test>git citool #使用Gui查看差异