summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
Commit message (Expand)AuthorAgeFilesLines
* use xmallocz to avoid size arithmeticJeff King2016-02-221-1/+1
* Convert struct object to object_idbrian m. carlson2015-11-201-1/+1
* Merge branch 'es/worktree-add'Junio C Hamano2015-10-261-1/+1
|\
| * worktree: usage: denote <branch> as optional with 'add'es/worktree-addSidhant Sharma2015-10-181-1/+1
* | worktree: add 'list' commandmr/worktree-listMichael Rappazzo2015-10-081-0/+88
* | Merge branch 'jc/am-state-fix'Junio C Hamano2015-08-311-5/+5
|\ \
| * | write_file(): drop caller-supplied LF from calls to create a one-liner filejc/am-state-fixJunio C Hamano2015-08-251-5/+5
| * | write_file(): drop "fatal" parameterJunio C Hamano2015-08-241-5/+5
* | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-121-40/+83
|\ \ \ | |/ / |/| |
| * | worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine2015-07-201-2/+1
| * | worktree: avoid resolving HEAD unnecessarilyEric Sunshine2015-07-201-12/+5
| * | worktree: make setup of new HEAD distinct from worktree populationEric Sunshine2015-07-201-5/+15
| * | worktree: detect branch-name/detached and error conditions locallyEric Sunshine2015-07-201-0/+18
| * | worktree: add_worktree: construct worktree-population command locallyEric Sunshine2015-07-201-11/+8
| * | worktree: elucidate environment variables intended for child processesEric Sunshine2015-07-201-2/+5
| * | worktree: make branch creation distinct from worktree populationEric Sunshine2015-07-201-3/+14
| * | worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine2015-07-201-1/+1
| * | worktree: make --detach mutually exclusive with -b/-BEric Sunshine2015-07-201-2/+2
| * | worktree: introduce options containerEric Sunshine2015-07-201-18/+27
| * | worktree: simplify new branch (-b/-B) option checkingEric Sunshine2015-07-201-5/+8
| * | worktree: improve worktree setup messageEric Sunshine2015-07-201-1/+1
| |/
* | Merge branch 'es/worktree-add'Junio C Hamano2015-07-131-0/+199
|\ \ | |/
| * Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano2015-07-121-1/+1
| * checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine2015-07-071-1/+1
| * worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-071-2/+6
| * worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-061-2/+4
| * worktree: extract basename computation to new functionEric Sunshine2015-07-061-9/+20
| * checkout: retire --to optionEric Sunshine2015-07-061-6/+138
| * worktree: add -b/-B optionsEric Sunshine2015-07-061-0/+11
| * worktree: add --detach optionEric Sunshine2015-07-061-1/+4
| * worktree: add --force optionEric Sunshine2015-07-061-1/+5
| * worktree: introduce "add" commandEric Sunshine2015-07-061-0/+31
|/
* worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-291-0/+133
View Lorry Controller Status