aboutsummaryrefslogtreecommitdiff
path: root/builtin/worktree.c
Commit message (Expand)AuthorAge
* Merge branch 'ps/worktree-prune-help-fix'Junio C Hamano2017-02-10
|\
| * worktree: fix option descriptions for `prune`Patrick Steinhardt2017-02-06
* | worktree list: keep the list sortedNguyễn Thái Ngọc Duy2016-11-28
* | worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-28
* | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-28
* | worktree: reorder an if statementNguyễn Thái Ngọc Duy2016-11-28
* | worktree: honor configuration variablesJunio C Hamano2016-09-27
* | use CHILD_PROCESS_INIT to initialize automatic variablesRené Scharfe2016-08-05
* | Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-28
|\ \
| * | worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-08
| * | worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-08
* | | avoid using sha1_to_hex output as printf formatJeff King2016-07-08
* | | Merge branch 'nd/worktree-cleanup-post-head-protection'Junio C Hamano2016-07-06
|\ \ \ | |/ /
| * | worktree: simplify prefixing pathsNguyễn Thái Ngọc Duy2016-05-24
| * | worktree: avoid 0{40}, too many zeroes, hard to readNguyễn Thái Ngọc Duy2016-05-24
| * | worktree.c: use is_dot_or_dotdot()Nguyễn Thái Ngọc Duy2016-05-24
| * | git-worktree.txt: keep subcommand listing in alphabetical orderNguyễn Thái Ngọc Duy2016-05-24
* | | worktree: allow "-" short-hand for @{-1} in add commandJordan DE GEA2016-05-31
* | | 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