TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed syntax highloght in README

This commit is contained in:
zhexuany 2016-11-21 20:25:22 +00:00 committed by syl20bnr
parent 034f2ea059
commit 19592f0ad5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layers/+source-control/git/README.org
View File

@ -178,8 +178,8 @@ intended. To work around this, you can use =v= instead (since Magit only stages
whole lines, in any case).
** Commit message editing buffer
In a commit message buffer press ~,c~ (if =dotspacemacs-major-mode-leader-key= is ~​,​~)
or ~C-c C-c~ to commit the changes with the entered message. Pressing ~,a~ or ~C-c C-k~
In a commit message buffer press ~​,​c~ (if =dotspacemacs-major-mode-leader-key= is ~​,​~)
or ~C-c C-c~ to commit the changes with the entered message. Pressing ~​,​a~ or ~C-c C-k~
will discard the commit message.
| Key Binding | Description |
@ -211,14 +211,14 @@ will discard the commit message.
- Amend a commit:
- ~l l~ to open =log buffer=
- ~c a~ on the commit you want to amend
- ~,c~ or ~C-c C-c~ to submit the changes
- ~​,​c~ or ~C-c C-c~ to submit the changes
- Squash last commit:
- ~l l~ to open =log buffer=
- ~r e~ on the second to last commit, it opens the =rebase buffer=
- ~j~ to put point on last commit
- ~s~ to squash it
- ~,c~ or ~C-c C-c~ to continue to the =commit message buffer=
- ~,c~ or ~C-c C-c~ again when you have finished to edit the commit message
- ~​,​c~ or ~C-c C-c~ to continue to the =commit message buffer=
- ~​,​c~ or ~C-c C-c~ again when you have finished to edit the commit message
- Force push a squashed commit:
- in the =status buffer= you should see the new commit unpushed and the old
commit unpulled