aboutsummaryrefslogtreecommitdiff
path: root/builtin/worktree.c
Commit message (Expand)AuthorAge
* Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-23
|\
| * worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-22
* | Merge branch 'nd/error-errno'Junio C Hamano2016-05-17
|\ \ | |/ |/|
| * builtin/worktree.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-09
* | worktree: add: introduce --checkout optionRay Zhang2016-03-29
|/
* Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-26
|\
| * use xmallocz to avoid size arithmeticJeff King2016-02-22
* | worktree add -B: do the checkout test before update branchNguyễn Thái Ngọc Duy2016-02-15
* | worktree: fix "add -B"Nguyễn Thái Ngọc Duy2016-02-15
|/
* Convert struct object to object_idbrian m. carlson2015-11-20
* Merge branch 'es/worktree-add'Junio C Hamano2015-10-26
|\
| * worktree: usage: denote <branch> as optional with 'add'Sidhant Sharma2015-10-18
* | worktree: add 'list' commandMichael Rappazzo2015-10-08
* | Merge branch 'jc/am-state-fix'Junio C Hamano2015-08-31
|\ \
| * | write_file(): drop caller-supplied LF from calls to create a one-liner fileJunio C Hamano2015-08-25
| * | write_file(): drop "fatal" parameterJunio C Hamano2015-08-24
* | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-12
|\ \ \ | |/ / |/| |
| * | worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine2015-07-20
| * | worktree: avoid resolving HEAD unnecessarilyEric Sunshine2015-07-20
| * | worktree: make setup of new HEAD distinct from worktree populationEric Sunshine2015-07-20
| * | worktree: detect branch-name/detached and error conditions locallyEric Sunshine2015-07-20
| * | worktree: add_worktree: construct worktree-population command locallyEric Sunshine2015-07-20
| * | worktree: elucidate environment variables intended for child processesEric Sunshine2015-07-20
| * | worktree: make branch creation distinct from worktree populationEric Sunshine2015-07-20
| * | worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine2015-07-20
| * | worktree: make --detach mutually exclusive with -b/-BEric Sunshine2015-07-20
| * | worktree: introduce options containerEric Sunshine2015-07-20
| * | worktree: simplify new branch (-b/-B) option checkingEric Sunshine2015-07-20
| * | worktree: improve worktree setup messageEric Sunshine2015-07-20
| |/
* | Merge branch 'es/worktree-add'Junio C Hamano2015-07-13
|\ \ | |/
| * Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano2015-07-12
| * checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine2015-07-07
| * worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-07
| * worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-06
| * worktree: extract basename computation to new functionEric Sunshine2015-07-06
| * checkout: retire --to optionEric Sunshine2015-07-06
| * worktree: add -b/-B optionsEric Sunshine2015-07-06
| * worktree: add --detach optionEric Sunshine2015-07-06
| * worktree: add --force optionEric Sunshine2015-07-06
| * worktree: introduce "add" commandEric Sunshine2015-07-06
|/
* worktree: new place for "git prune --worktrees"Nguyễn Thái Ngọc Duy2015-06-29