From b2401cf0be9af4ffa9ac8f8f458e20baf6639175 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Thu, 27 Oct 2016 17:15:29 +0100 Subject: [PATCH] git-diff: rework a bit for clarity (#1129) - use {{commit}} instead of {{PATHSPEC}} - start with the simplest invocation, git diff - move command to show staged changes next to the first two, which it is related to - clarify description of --summary example - move the .patch extension out of the token --- pages/common/git-diff.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pages/common/git-diff.md b/pages/common/git-diff.md index 2f0358ca4..69a9f8c15 100644 --- a/pages/common/git-diff.md +++ b/pages/common/git-diff.md @@ -2,22 +2,26 @@ > Show changes to tracked files. -- Show changes to tracked files: +- Show unstaged, uncommitted changes: -`git diff {{PATHSPEC}}` +`git diff` -- Show only names of changed files: +- Show all uncommitted changes (including staged ones): -`git diff --name-only {{PATHSPEC}}` +`git diff HEAD` -- Output a condensed summary of extended header information: - -`git diff --summary {{PATHSPEC}}` - -- Show staged (added, but not yet committed) changes only: +- Show only staged (added, but not yet committed) changes: `git diff --staged` +- Show only names of changed files since a given commit: + +`git diff --name-only {{commit}}` + +- Output a summary of file creations, renames and mode changes since a given commit: + +`git diff --summary {{commit}}` + - Create a patch file: -`git diff > {{target_file.patch}}` +`git diff > {{target_file}}.patch`