diff options
Diffstat (limited to 'admin/notes/repo')
| -rw-r--r-- | admin/notes/repo | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/notes/repo b/admin/notes/repo index 0da1e1e227a..827d6ed1b98 100644 --- a/admin/notes/repo +++ b/admin/notes/repo | |||
| @@ -11,7 +11,7 @@ install it only on the emacs-24 branch, not on the master as well. | |||
| 11 | Installing things manually into more than one branch makes merges more | 11 | Installing things manually into more than one branch makes merges more |
| 12 | difficult. | 12 | difficult. |
| 13 | 13 | ||
| 14 | http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01124.html | 14 | https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01124.html |
| 15 | 15 | ||
| 16 | The exception is, if you know that the change will be difficult to | 16 | The exception is, if you know that the change will be difficult to |
| 17 | merge to the master (eg because the master code has changed a lot). | 17 | merge to the master (eg because the master code has changed a lot). |
| @@ -40,7 +40,7 @@ so interim merges are unnecessary. | |||
| 40 | Or use shelves; or rebase; or do something else. See the thread for | 40 | Or use shelves; or rebase; or do something else. See the thread for |
| 41 | yet another fun excursion into the exciting world of version control. | 41 | yet another fun excursion into the exciting world of version control. |
| 42 | 42 | ||
| 43 | http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html | 43 | https://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html |
| 44 | 44 | ||
| 45 | * Installing changes from gnulib | 45 | * Installing changes from gnulib |
| 46 | 46 | ||