diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 11:33:57 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 11:33:57 -0800 |
commit | 66d3f19324ac9eeae8ef0d2ae2067ae7b18f8ac8 (patch) | |
tree | e94fa30407c0068170f6c19a94adadd66fcbeca7 /Makefile | |
parent | 1974f4791af2b8720f2983149defe13e571b3884 (diff) | |
parent | e92445a73173cf21a11b8e79cb7be16485deec69 (diff) | |
download | git-66d3f19324ac9eeae8ef0d2ae2067ae7b18f8ac8.tar.gz git-66d3f19324ac9eeae8ef0d2ae2067ae7b18f8ac8.tar.xz |
Merge branch 'tg/worktree-create-tracking'
The way "git worktree add" determines what branch to create from
where and checkout in the new worktree has been updated a bit.
* tg/worktree-create-tracking:
add worktree.guessRemote config option
worktree: add --guess-remote flag to add subcommand
worktree: make add <path> <branch> dwim
worktree: add --[no-]track option to the add subcommand
worktree: add can be created from any commit-ish
checkout: factor out functions to new lib file
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -759,6 +759,7 @@ LIB_OBJS += branch.o LIB_OBJS += bulk-checkin.o LIB_OBJS += bundle.o LIB_OBJS += cache-tree.o +LIB_OBJS += checkout.o LIB_OBJS += color.o LIB_OBJS += column.o LIB_OBJS += combine-diff.o |