First, you create your branch locally: git checkout -b <branch-name> # Create a new branch and check it out The remote branch is automatically created when you push it to the remote server. So when you feel ready for it, you can do: git push <remote-name> <branch-name> Where <remote-name> is typically origin, the name which … Read more
If you want to rename a branch while pointed to any branch, do: git branch -m <oldname> <newname> If you want to rename the current branch, you can do: git branch -m <newname> If you want to push the local branch and reset the upstream branch: git push origin -u <newname> And finally if you … Read more
Did you try git branch -D — –track ? the “–” is usually the convention for “what follows is not an option, whatever its name” From “The Art of Unix Programming”, section “Command-Line Options”: It is also conventional to recognize a double hyphen as a signal to stop option interpretation and treat all following arguments … Read more
git checkout master # first get back to master git checkout experiment — app.js # then copy the version of app.js # from branch “experiment” See also git how to undo changes of one file? Update August 2019, Git 2.23 With the new git switch and git restore commands, that would be: git switch master … Read more
Fast-forward merging makes sense for short-lived branches, but in a more complex history, non-fast-forward merging may make the history easier to understand, and make it easier to revert a group of commits. Warning: Non-fast-forwarding has potential side effects as well. Please review https://sandofsky.com/blog/git-workflow.html, avoid the ‘no-ff’ with its “checkpoint commits” that break bisect or blame, … Read more
This should be understood in the context of GitHub forks (where you fork a GitHub repo on GitHub before cloning that fork locally). upstream generally refers to the original repo that you have forked (see also “Definition of “downstream” and “upstream”” for more on upstream term) origin is your fork: your own repo on GitHub, … 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
You can make this happen with less typing. First, change the way your push works: git config –global push.default current This will infer the origin my_branch part, thus you can do: git push -u Which will both create the remote branch with the same name and track it.
You can control the default behavior by setting push.default in your git config. From the git-config(1) documentation: push.default Defines the action git push should take if no refspec is given on the command line, no refspec is configured in the remote, and no refspec is implied by any of the options given on the command … Read more
How to get the current branch name in Git?