aboutsummaryrefslogtreecommitdiff
path: root/git.wiki
diff options
context:
space:
mode:
Diffstat (limited to 'git.wiki')
-rw-r--r--git.wiki8
1 files changed, 8 insertions, 0 deletions
diff --git a/git.wiki b/git.wiki
index 7ed5931..4b8c09c 100644
--- a/git.wiki
+++ b/git.wiki
@@ -5,6 +5,14 @@
:: If HEAD is on matching tag, show tag name, otherwise show
:: _<tag name>_-_<commits since>_-_<short hash>_
+== Merge base ==
+
+{{{sh
+git merge-base <commit> <commit>
+}}}
+
+Show the closest common ancestor of two commits.
+
== Git hook "syntax" highlighting ==
The output of git hooks are in some cases highlighted, see the
following examples (each directly echoed to stdout from a post-receive