diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | src/blog/nvim-ts/git-rebase | 4 | ||||
| -rw-r--r-- | src/blog/nvim-ts/index.gsp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index 57a5600..834f24c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -13,7 +13,7 @@ dsts := $(srcs:%.gsp=%.html) all: $(dsts) %.html: %.gsp $(reqs) - m4 -P -Iinclude m4/* $< | gsp >$@ + m4 -P -Iinclude m4/__base.m4 m4/[a-z]* $< | gsp >$@ check: find src -name '*.gsp' -exec \ diff --git a/src/blog/nvim-ts/git-rebase b/src/blog/nvim-ts/git-rebase index f8c3a91..e3f32d6 100644 --- a/src/blog/nvim-ts/git-rebase +++ b/src/blog/nvim-ts/git-rebase @@ -16,8 +16,8 @@ pick 4c45214 Fix another typo # x, exec <command> = run command (the rest of the line) using shell # b, break = stop here (continue rebase later with 'git rebase --continue') # d, drop <commit> = remove commit -# l, label <label> = label current HEAD with a name -# t, reset <label> = reset HEAD to a label +# l, label <label> = label current ‘‘HEAD’’ with a name +# t, reset <label> = reset ‘‘HEAD’’ to a label # m, merge [-C <commit> | -c <commit>] <label> [# <oneline>] # create a merge commit using the original merge commit's # message (or the oneline, if no original merge commit was diff --git a/src/blog/nvim-ts/index.gsp b/src/blog/nvim-ts/index.gsp index e394e49..1c28687 100644 --- a/src/blog/nvim-ts/index.gsp +++ b/src/blog/nvim-ts/index.gsp @@ -42,9 +42,9 @@ html lang="en" { While for many people this might be fine, I personally find it much more clean to have the first and third commits merged into one commit, as they’re two parts of the same task. This is where Git-Rebase comes in. - We can run @code{-git rebase -i HEAD~N} where @code{-N} is - the number of commits back we want to include, which in this case would - be 3. Running that command will open the following buffer in your text + We can run @code{-git rebase -i ‘‘HEAD’’~N} where @code{-N} is the + number of commits back we want to include, which in this case would be + 3. Running that command will open the following buffer in your text editor. In my case, Neovim. } |