diff options
| author | Julia Evans <julia@jvns.ca> | 2025-08-23 00:42:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-23 09:03:29 -0700 |
| commit | af5a099197fca46fd0a255fe036ab03f2d63ffe3 (patch) | |
| tree | fb4c6ea7716c20e9eb2e8502942c026f8fce635a /git-send-email.perl | |
| parent | doc: git-rebase: start with an example (diff) | |
| download | git-af5a099197fca46fd0a255fe036ab03f2d63ffe3.tar.gz git-af5a099197fca46fd0a255fe036ab03f2d63ffe3.zip | |
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>
Diffstat (limited to 'git-send-email.perl')
0 files changed, 0 insertions, 0 deletions