summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-26 15:55:16 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-26 15:55:16 -0700
commita46dcfb8403191ce042ad123a3314a174fa9ca4c (patch)
treefa2b1265bbc89430e02e5b4ebc59f85ab6b55eb7 /git-merge-resolve.sh
parent9c53de7de12abfb9c13f5e7a82024680e3a90944 (diff)
parentbb9c03b82add467592249a222018a150684a4c97 (diff)
downloadgit-a46dcfb8403191ce042ad123a3314a174fa9ca4c.tar.gz
Merge branch 'mr/worktree-list'
Add the "list" subcommand to "git worktree". * mr/worktree-list: worktree: add 'list' command worktree: add details to the worktree struct worktree: add a function to get worktree details worktree: refactor find_linked_symref function worktree: add top-level worktree.c
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions