Once you know the hash of the stash commit you dropped, you can apply it as a stash: git stash apply $stash_hash Or, you can create a separate branch for it with git branch recovered $stash_hash After that, you can do whatever you want with all the normal tools. When you’re done, just blow the … Read more
To compare the current branch against main branch: $ git diff –name-status main To compare any two branches: $ git diff –name-status firstbranch..yourBranchName There is more options to git diff in the official documentation (and specifically –name-status option).
Attention: This method saves the credentials in plaintext on your PC’s disk. Everyone on your computer can access it, e.g. malicious NPM modules. Run git config –global credential.helper store then git pull provide a username and password and those details will then be remembered later. The credentials are stored in a file on the disk, … Read more
If it’s the first time you check-out a repo you need to use –init first: git submodule update –init –recursive For git 1.8.2 or above, the option –remote was added to support updating to latest tips of remote branches: git submodule update –recursive –remote This has the added benefit of respecting any “non default” branches … 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
Create the branch using a commit hash: git branch branch_name <commit-hash> Or by using a symbolic reference: git branch branch_name HEAD~3 To checkout the branch while creating it, use: git checkout -b branch_name <commit-hash or HEAD~3>
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