summaryrefslogtreecommitdiffhomepage
path: root/src/blog/nvim-ts/git-rebase
diff options
context:
space:
mode:
authorThomas Voss <mail@thomasvoss.com> 2024-02-23 15:19:26 +0100
committerThomas Voss <mail@thomasvoss.com> 2024-02-23 15:19:26 +0100
commit208ddaa76019af05d1e0f352912dab38ceedad6b (patch)
treeeafd9aefa77d7cf9581c2e4de87968d700d74aaf /src/blog/nvim-ts/git-rebase
parentab6d91982264623ae626115349d2c8a7579f1b1e (diff)
Add nvim-ts article
Diffstat (limited to 'src/blog/nvim-ts/git-rebase')
-rw-r--r--src/blog/nvim-ts/git-rebase34
1 files changed, 34 insertions, 0 deletions
diff --git a/src/blog/nvim-ts/git-rebase b/src/blog/nvim-ts/git-rebase
new file mode 100644
index 0000000..f8c3a91
--- /dev/null
+++ b/src/blog/nvim-ts/git-rebase
@@ -0,0 +1,34 @@
+pick d620266 Fix various typos
+pick 59fa2b6 Add new blog post
+pick 4c45214 Fix another typo
+
+# Rebase 10c3013..4c45214 onto 10c3013 (3 commands)
+#
+# Commands:
+# p, pick <commit> = use commit
+# r, reword <commit> = use commit, but edit the commit message
+# e, edit <commit> = use commit, but stop for amending
+# s, squash <commit> = use commit, but meld into previous commit
+# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
+# commit's log message, unless -C is used, in which case
+# keep only this commit's message; -c is same as -C but
+# opens the editor
+# 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
+# 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
+# specified); use -c <commit> to reword the commit message
+# u, update-ref <ref> = track a placeholder for the <ref> to be updated
+# to this position in the new commits. The <ref> is
+# updated at the end of the rebase
+#
+# These lines can be re-ordered; they are executed from top to bottom.
+#
+# If you remove a line here THAT COMMIT WILL BE LOST.
+#
+# However, if you remove everything, the rebase will be aborted.
+#