I would leave off the –soft in the other two answers and go with a simple git reset @^ (or git reset HEAD^ in older versions of git), which will default to git reset –mixed @^. The difference is that a soft reset leaves the files staged for commit, which is not what it sounds … Read more
1.- More than “save” your files, is act as Git expect to according their flow. (Advice, Git knows 🙂 ) 2.- Stash will move your modified files into a stack. So, later in the same or in another branch, you will be able to bring them back and see those modifications in your project. Stage … Read more
If you have a mix of modified and deleted files and only want to stage deleted files to the index, you can use git ls-files as a filter. git ls-files –deleted | xargs git add If you only want this to apply to part of the file tree, give one or more subdirectories as arguments … Read more
The best way to do this is by running the command: git diff –name-only –cached When you check the manual you will likely find the following: –name-only Show only names of changed files. And on the example part of the manual: git diff –cached Changes between the index and your current HEAD. Combined together, you … Read more
To list untracked files try: git ls-files –others –exclude-standard If you need to pipe the output to xargs, it is wise to mind white spaces using git ls-files -z and xargs -0: git ls-files -z -o –exclude-standard | xargs -0 git add Nice alias for adding untracked files: au = !git add $(git ls-files -o … Read more
Use git rm foo to stage the file for deletion. (This will also delete the file from the file system, if it hadn’t been previously deleted. It can, of course, be restored from git, since it was previously checked in.) To stage the file for deletion without deleting it from the file system, use git … Read more
You can show changes that have been staged with the –cached flag: $ git diff –cached In more recent versions of git, you can also use the –staged flag (–staged is a synonym for –cached): $ git diff –staged
It should just be: git diff –cached –cached means show the changes in the cache/index (i.e. staged changes) against the current HEAD. –staged is a synonym for –cached. –staged and –cached does not point to HEAD, just difference with respect to HEAD. If you cherry pick what to commit using git add –patch (or git … Read more