diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:14 +0900 |
| commit | db806d7064ee132c2dbb3d36d26da9adb5066260 (patch) | |
| tree | 4f61769a5e92923b5a81e471b6b873bd2bd7693e /t/t6047-diff3-conflict-markers.sh | |
| parent | Merge branch 'jc/am-show-current-patch-docfix' (diff) | |
| parent | path.c: don't call the match function without value in trie_find() (diff) | |
| download | tgif-db806d7064ee132c2dbb3d36d26da9adb5066260.tar.xz | |
Merge branch 'sg/dir-trie-fixes'
Code clean-up and a bugfix in the logic used to tell worktree local
and repository global refs apart.
* sg/dir-trie-fixes:
path.c: don't call the match function without value in trie_find()
path.c: clarify two field names in 'struct common_dir'
path.c: mark 'logs/HEAD' in 'common_list' as file
path.c: clarify trie_find()'s in-code comment
Documentation: mention more worktree-specific exceptions
Diffstat (limited to 't/t6047-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions