summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-16 02:51:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-16 02:51:51 (GMT)
commit4b44b7b1df44d371eaf3fbed75829d1a749bc7df (patch)
treed8ea9ed31a6946e476db01034a653a2bbd86084c /builtin/am.c
parenta0ab83ebd807f2bfe1a565ff94fe7d3c6903efee (diff)
parentd026a25657cbe15ceb6bcb5d5047a36a0a70b33e (diff)
downloadgit-4b44b7b1df44d371eaf3fbed75829d1a749bc7df.zip
git-4b44b7b1df44d371eaf3fbed75829d1a749bc7df.tar.gz
git-4b44b7b1df44d371eaf3fbed75829d1a749bc7df.tar.bz2
Merge branch 'nd/worktree-kill-parse-ref'
"git gc" did not interact well with "git worktree"-managed per-worktree refs. * nd/worktree-kill-parse-ref: refs: kill set_worktree_head_symref() worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() refs: introduce get_worktree_ref_store() refs: add REFS_STORE_ALL_CAPS refs.c: make submodule ref store hashmap generic environment.c: fix potential segfault by get_git_common_dir()
Diffstat (limited to 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions