diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2015-07-17 19:00:06 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-07-20 11:29:24 -0700 |
| commit | eef005dcb3e039ccc3da65e9347cf4357bdeea6a (patch) | |
| tree | 12e7d473ab012fd8ad357a6a8ea20eafb7f8028f /git-merge-resolve.sh | |
| parent | worktree: improve worktree setup message (diff) | |
| download | tgif-eef005dcb3e039ccc3da65e9347cf4357bdeea6a.tar.xz | |
worktree: simplify new branch (-b/-B) option checking
Make 'new_branch' be the name of the new branch for both forced and
non-forced cases; and add boolean 'force_new_branch' to indicate forced
branch creation. This will simplify logic later on when git-worktree
handles branch creation locally rather than delegating it to
git-checkout as part of the worktree population phase.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions