]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bf317d 63956c5)
Merge branch 'ml/doc-merge-updates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Jan 2024 22:05:15 +0000 (14:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Jan 2024 22:05:15 +0000 (14:05 -0800)
Doc update.

* ml/doc-merge-updates:
  Documentation/git-merge.txt: use backticks for command wrapping
  Documentation/git-merge.txt: fix reference to synopsis

1  2 
Documentation/git-merge.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-merge.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.