diff options
| author | gfyoung <gfyoung17+gitlab@gmail.com> | 2018-08-07 11:07:05 +0300 |
|---|---|---|
| committer | gfyoung <gfyoung17@gmail.com> | 2018-08-07 11:13:16 +0300 |
| commit | 7a56f0e93ae2c7121c92968371ebabdc6f427860 (patch) | |
| tree | 99f2ac24aba2ae7210c219e31970065a07c218a3 | |
| parent | b211f7c25307971f97646b59e56cede47380c9d6 (diff) | |
Update git rerere link in docs
The original link was moved.
| -rw-r--r-- | changelogs/unreleased/git-rerere-link-doc-update.yml | 5 | ||||
| -rw-r--r-- | doc/development/automatic_ce_ee_merge.md | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/git-rerere-link-doc-update.yml b/changelogs/unreleased/git-rerere-link-doc-update.yml new file mode 100644 index 00000000000..06093e8ec13 --- /dev/null +++ b/changelogs/unreleased/git-rerere-link-doc-update.yml @@ -0,0 +1,5 @@ +--- +title: Update git rerere link in docs +merge_request: 21060 +author: gfyoung +type: other diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index a85e5b1b1cc..8d41503f874 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/doc/development/automatic_ce_ee_merge.md @@ -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 |