kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update git rerere link in docs 

The original link was moved.
This commit is contained in:
gfyoung 2018-08-07 08:07:05 +00:00 committed by gfyoung
parent b211f7c253
commit 7a56f0e93a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/git-rerere-link-doc-update.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Update git rerere link in docs
merge_request: 21060
author: gfyoung
type: other

2
doc/development/automatic_ce_ee_merge.md
View File

@ -100,7 +100,7 @@ Notes:
number of times you have to resolve conflicts.
- Please remember to
[always have your EE merge request merged before the CE version](#always-merge-ee-merge-requests-before-their-ce-counterparts).
- You can use [`git rerere`](https://git-scm.com/blog/2010/03/08/rerere.html)
- You can use [`git rerere`](https://git-scm.com/docs/git-rerere)
to avoid resolving the same conflicts multiple times.
### Cherry-picking from CE to EE