Git: Difference between revisions
No edit summary |
No edit summary |
||
Line 75: | Line 75: | ||
# if files are in the way from the previously checked-out branch, you can force it... | # if files are in the way from the previously checked-out branch, you can force it... | ||
git checkout -f -b mynewbranchy origin/mynewbranchy | git checkout -f -b mynewbranchy origin/mynewbranchy | ||
|} | |||
{| class="mw-collapsible mw-collapsed wikitable" | |||
! git remove old branches | |||
|- | |||
| Explanation is [https://stackoverflow.com/a/23961231/717274 here]. | |||
Remote: | |||
git push origin --delete <branch> | |||
Local: | |||
git branch -d <branch> | |||
git fetch <remote> --prune # Delete multiple obsolete tracking branches | |||
|} | |} | ||
{| class="mw-collapsible mw-collapsed wikitable" | {| class="mw-collapsible mw-collapsed wikitable" |
Revision as of 13:30, 30 May 2018
TASKS
Expandgit new shared central bare repo |
---|
Expandcreate shared central repo for existing code |
---|
Expandgit merging conflicts after diverging |
---|
Expandgetting upstream commits into your GitHub fork |
---|
Expandgit create new branch on server, pull to client |
---|
Expandgit remove old branches |
---|
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 |
---|
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...