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 /contrib/examples/git-resolve.sh | |
| 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 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions