summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
Commit message (Expand)AuthorAgeFilesLines
* worktree list: keep the list sortednd/worktree-list-fixupNguyễn Thái Ngọc Duy2016-11-281-1/+1
* worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-281-3/+3
* get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-281-2/+4
* worktree: reorder an if statementNguyễn Thái Ngọc Duy2016-11-281-3/+3
* worktree: honor configuration variablesjc/worktree-configJunio C Hamano2016-09-271-0/+2
* use CHILD_PROCESS_INIT to initialize automatic variablesrs/child-process-initRené Scharfe2016-08-051-4/+2
* Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-281-0/+66
|\
| * worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-081-0/+28
| * worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-081-0/+38
* | avoid using sha1_to_hex output as printf formatJeff King2016-07-081-1/+1
* | Merge branch 'nd/worktree-cleanup-post-head-protection'Junio C Hamano2016-07-061-4/+6
|\ \ | |/
| * worktree: simplify prefixing pathsnd/worktree-cleanup-post-head-protectionNguyễn Thái Ngọc Duy2016-05-241-1/+3
| * worktree: avoid 0{40}, too many zeroes, hard to readNguyễn Thái Ngọc Duy2016-05-241-1/+1
| * worktree.c: use is_dot_or_dotdot()Nguyễn Thái Ngọc Duy2016-05-241-1/+1
| * git-worktree.txt: keep subcommand listing in alphabetical orderNguyễn Thái Ngọc Duy2016-05-241-1/+1
* | worktree: allow "-" short-hand for @{-1} in add commandjg/dash-is-last-branch-in-worktree-addJordan DE GEA2016-05-311-0/+3
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-2/+2
|\ \ | |/
| * worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-221-2/+2
* | Merge branch 'nd/error-errno'Junio C Hamano2016-05-171-1/+1
|\ \ | |/ |/|
| * builtin/worktree.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-1/+1
* | worktree: add: introduce --checkout optionrz/worktree-no-checkoutRay Zhang2016-03-291-11/+18
|/
* Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-1/+1
|\
| * use xmallocz to avoid size arithmeticJeff King2016-02-221-1/+1
* | worktree add -B: do the checkout test before update branchnd/worktree-add-BNguyễn Thái Ngọc Duy2016-02-151-1/+10
* | worktree: fix "add -B"Nguyễn Thái Ngọc Duy2016-02-151-3/+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
View Lorry Controller Status