diff options
| author | Juanma Barranquero | 2015-11-06 14:06:29 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2015-11-06 14:08:12 +0100 |
| commit | 3172a6ac39d98383451e8b36cd33d291347fc93b (patch) | |
| tree | 42a76c8db52482ea6f71bc4313181b2c954efabb /admin | |
| parent | 9b912623ad9032267106b134dd04e620c2b6c0a1 (diff) | |
| download | emacs-3172a6ac39d98383451e8b36cd33d291347fc93b.tar.gz emacs-3172a6ac39d98383451e8b36cd33d291347fc93b.zip | |
* admin/notes/repo: Fix a few obsolete references to Bazaar
Diffstat (limited to 'admin')
| -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 b27a3f42891..3ab3da78071 100644 --- a/admin/notes/repo +++ b/admin/notes/repo | |||
| @@ -41,8 +41,8 @@ preferable not to merge from master until you are done with the | |||
| 41 | feature. Unless you really need some change that was done on the | 41 | feature. Unless you really need some change that was done on the |
| 42 | master while you were developing on the branch, you don't really need | 42 | master while you were developing on the branch, you don't really need |
| 43 | those merges; just merge once, when you are done with the feature, and | 43 | those merges; just merge once, when you are done with the feature, and |
| 44 | Bazaar will take care of the rest. Bazaar is much better in this than | 44 | Git will take care of the rest. Git is much better in this than CVS, |
| 45 | CVS, so interim merges are unnecessary. | 45 | so interim merges are unnecessary. |
| 46 | 46 | ||
| 47 | Or use shelves; or rebase; or do something else. See the thread for | 47 | Or use shelves; or rebase; or do something else. See the thread for |
| 48 | yet another fun excursion into the exciting world of version control. | 48 | yet another fun excursion into the exciting world of version control. |