Use git rm. If you want to remove the file from the Git repository and the filesystem, use: git rm file1.txt git commit -m “remove file1.txt” But if you want to remove the file only from the Git repository and not remove it from the filesystem, use: git rm –cached file1.txt git commit -m “remove … Read more
From man git-stash (which can also be obtained via git help stash): The modifications stashed away by this command can be listed with git stash list, inspected with git stash show, and … show [<stash>] Show the changes recorded in the stash as a diff between the stashed state and its original parent. When no … Read more
NOTE: You can add other branches to exclude like master and dev if your workflow has those as a possible ancestor. Usually I branch off of a “sprint-start” tag and master, dev and qa are not ancestors. First, list locally-tracking branches that were merged in remote (consider using -r flag to list all remote-tracking branches). … Read more
To revert changes made to your working copy, do this: git checkout . Or equivalently, for git version >= 2.23: git restore . To revert changes made to the index (i.e., that you have added), do this. Warning this will reset all of your unpushed commits to master!: git reset To revert a change that … Read more
To turn any extended object reference into a hash, use git-rev-parse: git rev-parse HEAD or git rev-parse –verify HEAD To retrieve the short hash: git rev-parse –short HEAD To turn references (e.g. branches and tags) into hashes, use git show-ref and git for-each-ref.
.gitkeep isn’t documented, because it’s not a feature of Git. Git cannot add a completely empty directory. People who want to track empty directories in Git have created the convention of putting files called .gitkeep in these directories. The file could be called anything; Git assigns no special significance to this name. There is a … Read more
git diff –name-only SHA1 SHA2 where you only need to include enough of the SHA hash to identify the commits. You can also do, for example git diff –name-only HEAD~10 HEAD~5 to see the differences between the tenth latest commit and the fifth latest (or so).
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
With version 2.13 of Git and later, –recurse-submodules can be used instead of –recursive: git clone –recurse-submodules -j8 git://github.com/foo/bar.git cd bar Editor’s note: -j8 is an optional performance optimization that became available in version 2.8, and fetches up to 8 submodules at a time in parallel — see man git-clone. With version 1.9 of Git … Read more
Probably the simplest way to achieve this is with git archive. If you really need just the expanded tree you can do something like this. git archive master | tar -x -C /somewhere/else Most of the time that I need to ‘export’ something from git, I want a compressed archive in any case so I … Read more