Pat Notz is correct. You can get the commit back so long as it’s been within a few days. git only garbage collects after about a month or so unless you explicitly tell it to remove newer blobs. $ git init Initialized empty Git repository in .git/ $ echo “testing reset” > file1 $ git … Read more
An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again. If a negated pattern matches, this will override lower precedence patterns sources. # Ignore everything * # But not these files… !.gitignore !script.pl !template.latex # etc… # …even if they are in subdirectories !*/ # … Read more
For Git 2.6+ (released 28 Sept 2015) The only git config setting which would be of interest is: rebase.autostash (with Git 2.27, Q2 2020, you now also have merge.autostash, see below) When set to true, automatically create a temporary stash before the operation begins, and apply it after the operation ends. This means that you … Read more
How to change the URI (URL) for a remote Git repository?
Undo a Git merge that hasn’t been pushed yet
Do a “git export” (like “svn export”)?
This thread mentions: If you don’t remember the empty tree sha1, you can always derive it with: git hash-object -t tree /dev/null Or, as Ciro Santilli proposes in the comments: printf ” | git hash-object –stdin -t tree Or, as seen here, from Colin Schimmelfing: git hash-object -t tree –stdin < /dev/null So I guess … Read more
Message ‘src refspec master does not match any’ when pushing commits in Git
This answer only applies to Git version 1.x. For Git version 2.x, see other answers. Summary: git add -A stages all changes git add . stages new files and modifications, without deletions (on the current directory and its subdirectories). git add -u stages modifications and deletions, without new files Detail: git add -A is equivalent … Read more
Please don’t use this recipe if your situation is not the one described in the question. This recipe is for fixing a bad merge, and replaying your good commits onto a fixed merge. Although filter-branch will do what you want, it is quite a complex command and I would probably choose to do this with … Read more