diff options
| author | Gerd Möllmann | 2022-11-01 10:25:28 +0100 |
|---|---|---|
| committer | Gerd Möllmann | 2022-11-01 10:25:28 +0100 |
| commit | e7c105fd73dbede4d00c1f26ad2273d49fabd0da (patch) | |
| tree | d453ef8a12630842616d829ec1e3894f99afbe62 /admin | |
| parent | d305eaf4ce56177171aa1bcde80bbed5fc486a45 (diff) | |
| download | emacs-e7c105fd73dbede4d00c1f26ad2273d49fabd0da.tar.gz emacs-e7c105fd73dbede4d00c1f26ad2273d49fabd0da.zip | |
; Mention git bisect's --first-parent in admin/notes/repo
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/notes/repo | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/notes/repo b/admin/notes/repo index 2185c5a0036..afba3dca8f8 100644 --- a/admin/notes/repo +++ b/admin/notes/repo | |||
| @@ -128,6 +128,11 @@ again. | |||
| 128 | This is a semi-automated way to find the revision that introduced a bug. | 128 | This is a semi-automated way to find the revision that introduced a bug. |
| 129 | Browse 'git help bisect' for technical instructions. | 129 | Browse 'git help bisect' for technical instructions. |
| 130 | 130 | ||
| 131 | Depending on what you want to do, it can be helpful to start bisecing | ||
| 132 | with the option '--first-parent', like `git bisect start | ||
| 133 | --first-parent', which makes bisect ignore commits coming into a | ||
| 134 | branch from merges. | ||
| 135 | |||
| 131 | * Maintaining ChangeLog history | 136 | * Maintaining ChangeLog history |
| 132 | 137 | ||
| 133 | Older ChangeLog entries are kept in history files named ChangeLog.1, | 138 | Older ChangeLog entries are kept in history files named ChangeLog.1, |