From 19592f0ad5b409d11d3e007f53228eedcb7b8c5d Mon Sep 17 00:00:00 2001 From: zhexuany Date: Mon, 21 Nov 2016 20:25:22 +0000 Subject: [PATCH] fixed syntax highloght in README --- layers/+source-control/git/README.org | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layers/+source-control/git/README.org b/layers/+source-control/git/README.org index 0d2603d19..34f8230dd 100644 --- a/layers/+source-control/git/README.org +++ b/layers/+source-control/git/README.org @@ -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