linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update README.textile

Browse source
This commit is contained in:
Stibbons 2013-07-15 15:22:07 +02:00
commit c1e1dd220f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.textile
View file

@ -38,7 +38,7 @@ h2. Git-Repo Project (Android)
# gg # dear git, commit my change # gg # dear git, commit my change
# ru # dear repo, please upload everything change to the remote # ru # dear repo, please upload everything change to the remote
h2 Merging h2. Merging
# git merge <tab><tab><tab> # dear git, please merge this branch to mine # git merge <tab><tab><tab> # dear git, please merge this branch to mine
(conflict araises) (conflict araises)
@ -48,7 +48,7 @@ h2 Merging
(edit the commit message) (edit the commit message)
# gp # dear git, push that to my remote # gp # dear git, push that to my remote
h2 Rebase / fixup / squash / reorder / split commit history h2. Rebase / fixup / squash / reorder / split commit history
# git rewrite-history # dear git, let me edit you history up to 2 commits behind (git rebase -i HEAD~2) # git rewrite-history # dear git, let me edit you history up to 2 commits behind (git rebase -i HEAD~2)
# git rewrite-history4 # dear git, let me edit you history up to 4 commits behind (git rebase -i HEAD~4) # git rewrite-history4 # dear git, let me edit you history up to 4 commits behind (git rebase -i HEAD~4)