diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-26 15:55:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 15:55:16 -0700 |
| commit | a46dcfb8403191ce042ad123a3314a174fa9ca4c (patch) | |
| tree | fa2b1265bbc89430e02e5b4ebc59f85ab6b55eb7 /builtin/notes.c | |
| parent | Merge branch 'jc/am-3-fallback-regression-fix' (diff) | |
| parent | worktree: add 'list' command (diff) | |
| download | tgif-a46dcfb8403191ce042ad123a3314a174fa9ca4c.tar.xz | |
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 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 3608c64785..13c0af9155 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -19,7 +19,7 @@ #include "string-list.h" #include "notes-merge.h" #include "notes-utils.h" -#include "branch.h" +#include "worktree.h" static const char * const git_notes_usage[] = { N_("git notes [--ref <notes-ref>] [list [<object>]]"), |