diff --git a/README.textile b/README.textile index f3ddf1bcb..e2ca052fa 100644 --- a/README.textile +++ b/README.textile @@ -39,6 +39,7 @@ h2. Git-Repo Project (Android) # ru # dear repo, please upload everything change to the remote h2 Merging + # git merge # dear git, please merge this branch to mine (conflict araises) # gmt # dear git, show me what's wrong! @@ -48,11 +49,13 @@ h2 Merging # gp # dear git, push that to my remote 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-history4 # dear git, let me edit you history up to 4 commits behind (git rebase -i HEAD~4) # git rewrite-history10 # dear git, let me edit you history up to 10 commits behind (git rebase -i HEAD~10) h3. Text search + # sgrep "substring" .