tldr/pages/common/git-diff.md

37 lines
939 B
Markdown
Raw Normal View History

2015-10-22 08:31:52 +01:00
# git diff
2014-03-09 12:20:13 +00:00
> Show changes to tracked files.
> More information: <https://git-scm.com/docs/git-diff>.
2014-03-09 12:20:13 +00:00
- Show unstaged, uncommitted changes:
2014-03-09 12:20:13 +00:00
`git diff`
- Show all uncommitted changes (including staged ones):
`git diff HEAD`
- Show only staged (added, but not yet committed) changes:
`git diff --staged`
2015-12-29 10:05:57 +00:00
- Show changes from all commits since a given date/time (a date expression, e.g. "1 week 2 days" or an ISO date):
`git diff 'HEAD@{3 months|weeks|days|hours|seconds ago}'`
- Show only names of changed files since a given commit:
2015-12-29 10:05:57 +00:00
`git diff --name-only {{commit}}`
- Output a summary of file creations, renames and mode changes since a given commit:
`git diff --summary {{commit}}`
2016-06-17 12:08:01 +01:00
- Compare a single file between two branches or commits:
`git diff {{branch_1}}..{{branch_2}} [--] {{path/to/file}}`
- Compare different files from the current branch to other branch:
`git diff {{branch}}:{{path/to/file2}} {{path/to/file}}`