git remote prune origin prunes tracking branches not on the remote. git branch –merged lists branches that have been merged into the current branch. xargs git branch -d deletes branches listed on standard input. Be careful deleting branches listed by git branch –merged. The list could include master or other branches you’d prefer not to … Read more
You should be able to use the “ours” merge strategy to overwrite master with seotweaks like this: git checkout seotweaks git merge -s ours master git checkout master git merge seotweaks The result should be your master is now essentially seotweaks. (-s ours is short for –strategy=ours) From the docs about the ‘ours’ strategy: This … Read more
TL;DR answer git branch -r | grep -v ‘\->’ | sed “s,\x1B\[[0-9;]*[a-zA-Z],,g” | while read remote; do git branch –track “${remote#origin/}” “$remote”; done git fetch –all git pull –all (It seems that pull fetches all branches from all remotes, but I always fetch first just to be sure.) Run the first command only if there … 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).
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>
How I would do this git checkout master git pull origin master git merge test git push origin master If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what … Read more
Update: Using Git Switch All of the information written below was accurate, but a new command, git switch has been added that simplifies the effort. If daves_branch exists on the remote repository, but not on your local branch, you can simply type: git switch daves_branch Since you do not have the branch locally, this will … Read more
To display only the name of the current branch you’re on: git rev-parse –abbrev-ref HEAD Reference: Show just the current branch in Git
First, create a new local branch and check it out: git checkout -b <branch-name> The remote branch is automatically created when you push it to the remote server: git push <remote-name> <branch-name> <remote-name> is typically origin, which is the name which git gives to the remote you cloned from. Your colleagues may then simply pull … Read more
Update 2020 / Git 2.23 Git 2.23 adds the new switch subcommand in an attempt to clear some of the confusion that comes from the overloaded usage of checkout (switching branches, restoring files, detaching HEAD, etc.) Starting with this version of Git, replace the checkout command with: git switch -c <new-branch> The behavior is identical … Read more