我注意到,在处理一两张票时,如果我走开,我不确定我在做什么,什么改变了,等等。

是否有一种方法可以在git添加和提交之前查看给定文件所做的更改?


当前回答

你要找的是

Git diff——阶段性的

根据你的具体情况,有三种有用的方法来使用git diff:

显示索引和工作树之间的差异;也就是说,你还没有提交的更改:

git diff [filename]

显示当前提交和索引之间的差异;也就是说,你要提交的东西(——staging做完全相同的事情,使用你喜欢的东西):

git diff --cached [filename]

显示当前提交和工作树之间的差异:

git diff HEAD [filename]

Git diff在目录上递归地工作,如果没有给出路径,它会显示所有更改。

其他回答

你要找的是

Git diff——阶段性的

根据你的具体情况,有三种有用的方法来使用git diff:

显示索引和工作树之间的差异;也就是说,你还没有提交的更改:

git diff [filename]

显示当前提交和索引之间的差异;也就是说,你要提交的东西(——staging做完全相同的事情,使用你喜欢的东西):

git diff --cached [filename]

显示当前提交和工作树之间的差异:

git diff HEAD [filename]

Git diff在目录上递归地工作,如果没有给出路径,它会显示所有更改。

For me git add -p is the most useful way (and intended I think by git developers?) to review all unstaged changes (it shows the diff for each file), choose a good set of changes that ought to go with a commit, then when you have staged all of those, then use git commit, and repeat for the next commit. Then you can make each commit be a useful or meaningful set of changes even if they took place in various files. I would also suggest creating a new branch for each ticket or similar activity, and switch between them using checkout (perhaps using git stash if you don't want to commit before switching), though if you are doing many quick changes this may be a pain. Don't forget to merge often.

好吧,我的情况下,当你不想关心文件列表。让他们都看看。

当你已经运行git添加到你的文件列表:

$ git diff --cached $(git diff --cached --name-only)

在git的最新版本中,您可以使用—staging also,这是—cached的同义词。

同样可以用于没有添加文件但没有——cached选项。

$ git diff $(git diff --name-only)

“cached”选项的Git命令别名:

$ git config --global alias.diff-cached '!git diff --cached $(git diff --cached --name-only)'

你也可以使用git友好的文本编辑器。它们显示已修改的行上的颜色,添加的行显示另一种颜色,删除的行显示另一种颜色,等等。

GitHub的Atom 1.0就是一个很好的文本编辑器。

使用git-diff:

git diff -- yourfile