Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.

Commit

Permalink
Merge pull request #3 from ebouchut/patch-1
Browse files Browse the repository at this point in the history
Fix a typo.
  • Loading branch information
codeinthehole committed Feb 7, 2017
2 parents ec5d966 + 13ae024 commit 58ad3d2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion www/posts/0065-git-tips.rst
Expand Up @@ -245,7 +245,7 @@ from the feature branch.
(feature/masquerading) $ git checkout master (feature/masquerading) $ git checkout master
(master) $ git merge --no-ff feature/masquerading (master) $ git merge --no-ff feature/masquerading


When you view the your history as a graph, you will be able to tell which When you view the history as a graph, you will be able to tell which
commits were from the feature branch. commits were from the feature branch.


Now delete the local and remote feature branches: Now delete the local and remote feature branches:
Expand Down

0 comments on commit 58ad3d2

Please sign in to comment.