]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18cd756 953049e)
Merge branch 'ts/merge-orig-head-doc-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jul 2025 18:19:27 +0000 (11:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jul 2025 18:19:28 +0000 (11:19 -0700)
Doc fix.

* ts/merge-orig-head-doc-fix:
  docs: correct ORIG_HEAD example in "git merge" documentation

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

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