git reset –hard # removes staged and working directory changes ## !! be very careful with these !! ## you may end up deleting what you don’t want to ## read comments and manual. git clean -f -d # remove untracked git clean -f -x -d # CAUTION: as above but removes ignored files like … Read more
Summary The error message Cannot ‘squash’ without a previous commit means you likely attempted to “squash downward.” Git always squashes a newer commit into an older commit or “upward” as viewed on the interactive rebase todo list, that is into a commit on a previous line. Changing the command on your todo list’s very first … Read more
Git 1.7.2 introduced the ability to cherry pick a range of commits. From the release notes: git cherry-pick learned to pick a range of commits (e.g. cherry-pick A..B and cherry-pick –stdin), so did git revert; these do not support the nicer sequencing control rebase [-i] has, though. To cherry-pick all the commits from commit A … Read more
Here are some branch naming conventions that I use and the reasons for them Branch naming conventions Use grouping tokens (words) at the beginning of your branch names. Define and use short lead tokens to differentiate branches in a way that is meaningful to your workflow. Use slashes to separate parts of your branch names. … Read more
You can create tags for GitHub by either using: the Git command line, or GitHub’s web interface. Creating tags from the command line To create a tag on your current branch, run this: git tag <tagname> If you want to include a description with your tag, add -a to create an annotated tag: git tag … Read more
If you exclude application/, then everything under it will always be excluded (even if some later negative exclusion pattern (“unignore”) might match something under application/). To do what you want, you have to “unignore” every parent directory of anything that you want to “unignore”. Usually you end up writing rules for this situation in pairs: … Read more
Running git pull performs the following tasks, in order: git fetch git merge The merge step combines branches that have been setup to be merged in your config. You want to undo the merge step, but probably not the fetch (doesn’t make a lot of sense and shouldn’t be necessary). To undo the merge, use … Read more
git diff <local branch> <remote>/<remote branch> For example, git diff main origin/main, or git diff featureA origin/next Of course to have said remote-tracking branch you need to git fetch first; and you need it to have up-to-date information about branches in the remote repository.
How do we merge the master branch into the feature branch? Easy: git checkout feature1 git merge master There is no point in forcing a fast forward merge here, as it cannot be done. You committed both into the feature branch and the master branch. Fast forward is impossible now. Have a look at GitFlow. … Read more
From the git-diff manpage: git diff [–options] <commit> <commit> [–] [<path>…] For instance, to see the difference for a file “main.c” between now and two commits back, here are three equivalent commands: $ git diff HEAD^^ HEAD main.c $ git diff HEAD^^..HEAD — main.c $ git diff HEAD~2 HEAD — main.c