From 1849e3a3f44ffa61b1f466da023d558318c261b2 Mon Sep 17 00:00:00 2001 From: Daniel Jackoway Date: Thu, 5 Aug 2010 01:42:13 +0800 Subject: mention git diff --cached when talking about how not to commit sensitive data --- _posts/2009-09-09-removing-sensitive-data.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_posts/2009-09-09-removing-sensitive-data.textile') diff --git a/_posts/2009-09-09-removing-sensitive-data.textile b/_posts/2009-09-09-removing-sensitive-data.textile index 185dfd2..5144691 100644 --- a/_posts/2009-09-09-removing-sensitive-data.textile +++ b/_posts/2009-09-09-removing-sensitive-data.textile @@ -77,7 +77,7 @@ Be warned that force-pushing does not erase commits on the remote repo, it simpl h2. Avoiding accidental commits in the future -There are a few simple tricks to avoid committing things you don't want committed. The first, and simplest, is to use a visual tool like git-gui or "gitx":http://gitx.frim.nl/ to make your commits. This lets you see exactly what you're committing, and ensure that only the files you want are added to the repo. If you're working form the command line, avoid the catch-all commands `git add .` and `git commit -a`, instead use `git add filename` and `git rm filename` to individually stage files. You can also use `git add --interactive` to review each changed file and stage it, or part of it, for commit. +There are a few simple tricks to avoid committing things you don't want committed. The first, and simplest, is to use a visual tool like git-gui or "gitx":http://gitx.frim.nl/ to make your commits. This lets you see exactly what you're committing, and ensure that only the files you want are added to the repo. If you're working form the command line, avoid the catch-all commands `git add .` and `git commit -a`, instead use `git add filename` and `git rm filename` to individually stage files. You can also use `git add --interactive` to review each changed file and stage it, or part of it, for commit. If you're working from the command line, you can also use `git diff --cached` to see what changes you have staged for commit. This is the exact diff that your commit will have as long as you commit without the `-a` flag. h2. Other reading -- cgit v1.3.1