Remove directory from Git and local Checkout ‘master’ with both directories: git rm -r one-of-the-directories // This deletes from filesystem git commit . -m “Remove duplicated directory” git push origin <your-git-branch> (typically ‘master’, but not always) Remove directory from Git but NOT local To remove this directory from Git but not delete it entirely from … 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
Short answer: git reset ‘HEAD@{1}’ Long answer: Git keeps a log of all ref updates (e.g., checkout, reset, commit, merge). You can view it by typing: git reflog Somewhere in this list is the commit that you lost. Let’s say you just typed git reset HEAD~ and want to undo it. My reflog looks like … Read more
In git revert -m, the -m option specifies the parent number. This is needed because a merge commit has more than one parent, and Git does not know automatically which parent was the mainline, and which parent was the branch you want to un-merge. When you view a merge commit in the output of git … Read more
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
I would recommend to use the new git filter-repo, which replaces BFG and git filter-branch. Note: if you get the following error message when running the above-mentioned commands: Error: need a version of `git` whose `diff-tree` command has the `–combined-all-paths` option` it means you have to update git. First: do that one copy of your … Read more
What is git rerere? As the documentation notes, rerere stands for reuse recorded resolution. That doesn’t really explain what it is, though. It’s worth adding first, here, that git rerere itself—the command—is not something you have to run. It has just six subcommands: clear, forget, diff, status, remaining, and gc. None of these record or … Read more
Required reading is Problems with rewriting history in the Git User’s Manual. If I rewrite history (and everything compiles/works in all affected branches), will my co-workers need to do any special commands (i.e. will they “know that I have done it” if I did it well?)? They will know, and Git will tell them in … Read more
Setting the configuration variables: receive.denyNonFastForwards receive.denyDeletes will prevent any ‘forced’ pushes from working across all branches. If you want finer pre-branch control then you will have to use a ‘hook’ on the remote repository, probably the ‘update’ hook. There is a sample update hook called ‘update-paranoid’ that probably does what you need (and more) in … Read more
From Git Wiki: Graft points or grafts enable two otherwise different lines of development to be joined together. It works by letting users record fake ancestry information for commits. This way you can make git pretend the set of parents a commit has is different from what was recorded when the commit was created. Reasons … Read more