diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:11 -0700 |
| commit | 297ae7151f85b677e58d6804d35e88d1375abaeb (patch) | |
| tree | 50812982cb3e7f193332e0af32e821ba3d455e3d /Documentation | |
| parent | Merge branch 'nk/stash-show-config' (diff) | |
| parent | refs: make refs/bisect/* per-worktree (diff) | |
| download | tgif-297ae7151f85b677e58d6804d35e88d1375abaeb.tar.xz | |
Merge branch 'dt/refs-bisection'
Move the refs used during a "git bisect" session to per-worktree
hierarchy refs/worktree/* so that independent bisect sessions can
be done in different worktrees.
* dt/refs-bisection:
refs: make refs/bisect/* per-worktree
path: optimize common dir checking
refs: clean up common_list
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/glossary-content.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 8c6478b2f2..e225974253 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -413,8 +413,9 @@ exclude;; [[def_per_worktree_ref]]per-worktree ref:: Refs that are per-<<def_working_tree,worktree>>, rather than - global. This is presently only <<def_HEAD,HEAD>>, but might - later include other unusual refs. + global. This is presently only <<def_HEAD,HEAD>> and any refs + that start with `refs/bisect/`, but might later include other + unusual refs. [[def_pseudoref]]pseudoref:: Pseudorefs are a class of files under `$GIT_DIR` which behave |