]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/config/format.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 974c936 63956c5)
Merge branch 'ml/doc-merge-updates' into maint-2.43
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Feb 2024 00:22:10 +0000 (16:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Feb 2024 00:22:10 +0000 (16:22 -0800)
commit3aea0dad70446222adf0e111aac70285a5735604
treec301dcc149ff4c8b24a33cad8b77b5eb93e40ce9tree | snapshot
parent974c9369aa98037b0059e4257144f01af62fae71commit | diff
parent63956c553d67fbc30a3c651e8115c4696eca4085commit | diff
Merge branch 'ml/doc-merge-updates' into maint-2.43

Doc update.

* ml/doc-merge-updates:
  Documentation/git-merge.txt: use backticks for command wrapping
  Documentation/git-merge.txt: fix reference to synopsis
Documentation/git-merge.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.