alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/joshdutcher/git-flight-rules into joshdutcher-master

Browse Source 
# Conflicts:
#	README.md
This commit is contained in:
Richard Littauer 2015-03-16 10:19:49 -07:00
commit 5b0a37cfdd
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
README.md
View File

@ -436,3 +436,22 @@ On OS X and Linux, your git configuration file is stored in ```~/.gitconfig```.
wip = rebase -i @{u} wip = rebase -i @{u}
zap = fetch -p zap = fetch -p
``` ```
<a name="pull-wrong-branch"></a>
## I pulled from/into the wrong branch
This is another chance to use `git reflog` to see where your HEAD pointed before the bad pull.
```
(master)$ git reflog
ab7555f HEAD@{0}: pull origin wrong-branch: Fast-forward
c5bc55a HEAD@{1}: checkout: checkout message goes here
```
Simply reset your branch back to the desired commit:
```
git reset --hard c5bc55a
```
Done.