]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f39a29c) | patch
doc: git rebase: dedup merge conflict discussion
authorJulia Evans <julia@jvns.ca>
Sat, 23 Aug 2025 00:42:59 +0000 (00:42 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Aug 2025 16:03:29 +0000 (09:03 -0700)
commitaf5a099197fca46fd0a255fe036ab03f2d63ffe3
treefb4c6ea7716c20e9eb2e8502942c026f8fce635atree | snapshot
parentf39a29c22ee5deb184517c99890bd749f2114a98commit | diff
doc: git rebase: dedup merge conflict discussion

Previously there were two explanations, this combines them both into a
single explanation.

Signed-off-by: Julia Evans <julia@jvns.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.adoc diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.