Git: Difference between revisions
No edit summary |
No edit summary |
||
Line 45: | Line 45: | ||
| This will move recent commits AND uncommitted changes into a new branch (but you probably want to finish by cleaning out commits from starting branch, and repulling after you merge the feature). | | This will move recent commits AND uncommitted changes into a new branch (but you probably want to finish by cleaning out commits from starting branch, and repulling after you merge the feature). | ||
git checkout -b feature/whiz-bang | git checkout -b feature/whiz-bang | ||
# | # Do this ONCE: git config --global push.default current | ||
# | # From then on: | ||
git push -u | git push -u | ||
# OR, if you don't want the config, you have to be more specific: | |||
# git push -u origin feature/whiz-bang | |||
|} | |} | ||
{| class="mw-collapsible mw-collapsed wikitable" | {| class="mw-collapsible mw-collapsed wikitable" |
Revision as of 18:54, 28 May 2019
TASKS
Expandgit new shared central bare repo |
---|
Expandcreate shared central repo for existing code |
---|
Expandgit merging conflicts after diverging |
---|
Expandgit create and push a feature branch |
---|
Expandgetting upstream commits into your GitHub fork |
---|
Expandgit create new branch on server, pull to client |
---|
Expandgit remove old branches |
---|
ExpandWork with two local repos |
---|
Expandgit pull when untracked files are in the way |
---|
Expandgit create new branch when untracked files are in the way |
---|
Expandgit recreate repo |
---|
Expandgit connect to origin after the fact |
---|
Expandgit ignore local and remote changes to a file |
---|
Expandgit branch rebase to keep master intact |
---|
Expandgit changing branches in a project with submodules |
---|
Expandgit hard-reset a misbehaving submodule to parent commit version |
---|
CONFIGURATION
Expandgit visual difftool and mergetool setup |
---|
Expandgit convert to a bare repo |
---|
Expandgit convert bare to a mirror of remote (github, facebook, etc) |
---|
Expandgit create merge-to command |
---|
Expandgit fix github diverge from local bare repo following README.md edit |
---|
Expandgit windows configure notepad++ editor |
---|
Expandgit fix push behavior - ONLY PUSH CURRENT doh |
---|
Expandgit multiple upstreams |
---|
From here...