summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tg/worktree-add-existing-branch'Junio C Hamano2018-05-231-27/+74
|\
| * worktree: teach "add" to check out existing branchesThomas Gummerer2018-04-301-2/+11
| * worktree: factor out dwim_branch functionThomas Gummerer2018-04-301-11/+18
| * worktree: improve message when creating a new worktreeThomas Gummerer2018-04-301-2/+36
| * worktree: remove extra members from struct add_optsThomas Gummerer2018-04-301-17/+16
* | Merge branch 'sb/worktree-remove-opt-force'Junio C Hamano2018-05-081-2/+3
|\ \
| * | worktree: accept -f as short for --force for removalStefan Beller2018-04-181-2/+3
* | | Merge branch 'nd/worktree-prune'Junio C Hamano2018-04-101-9/+2
|\ \ \
| * | | worktree prune: improve prune logic when worktree is movednd/worktree-pruneNguyễn Thái Ngọc Duy2018-03-151-1/+2
| * | | worktree: delete dead codeNguyễn Thái Ngọc Duy2018-03-151-8/+0
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-2/+2
| |/ /
* | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-141-1/+3
|\ \ \
| * | | completion: use __gitcomp_builtin in _git_worktreeNguyễn Thái Ngọc Duy2018-02-091-1/+1
| * | | parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy2018-02-091-1/+3
| | |/ | |/|
* | | Merge branch 'nd/worktree-move'Junio C Hamano2018-03-141-0/+220
|\ \ \ | |_|/ |/| |
| * | worktree remove: allow it when $GIT_WORK_TREE is already goneNguyễn Thái Ngọc Duy2018-02-121-5/+7
| * | worktree remove: new commandNguyễn Thái Ngọc Duy2018-02-121-1/+133
| * | worktree move: refuse to move worktrees with submodulesNguyễn Thái Ngọc Duy2018-02-121-0/+23
| * | worktree move: accept destination as directoryNguyễn Thái Ngọc Duy2018-02-121-1/+10
| * | worktree move: new commandNguyễn Thái Ngọc Duy2018-02-121-0/+53
| |/
* | Merge branch 'es/worktree-add-post-checkout-hook'Junio C Hamano2018-02-281-3/+17
|\ \
| * | worktree: add: fix 'post-checkout' not knowing new worktree locationes/worktree-add-post-checkout-hookEric Sunshine2018-02-151-3/+17
* | | Merge branch 'jc/worktree-add-short-help'Junio C Hamano2018-02-151-1/+1
|\ \ \ | |_|/ |/| |
| * | worktree: say that "add" takes an arbitrary commit in short-helpjc/worktree-add-short-helpJunio C Hamano2018-01-171-1/+1
* | | Merge branch 'es/worktree-checkout-hook'Junio C Hamano2017-12-271-6/+16
|\ \ \ | |/ / |/| / | |/
| * worktree: invoke post-checkout hook (unless --no-checkout)es/worktree-checkout-hookEric Sunshine2017-12-071-6/+16
* | add worktree.guessRemote config optionThomas Gummerer2017-12-061-2/+12
* | worktree: add --guess-remote flag to add subcommandThomas Gummerer2017-12-061-0/+10
* | worktree: make add <path> <branch> dwimThomas Gummerer2017-11-271-0/+16
* | worktree: add --[no-]track option to the add subcommandThomas Gummerer2017-11-271-0/+8
|/
* worktree: convert struct worktree to object_idbrian m. carlson2017-10-161-3/+3
* worktree: check the result of read_in_full()jk/read-in-fullJeff King2017-09-271-1/+18
* worktree: use xsize_t to access file sizeJeff King2017-09-271-2/+3
* add UNLEAK annotation for reducing leak false positivesJeff King2017-09-081-0/+2
* Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-4/+2
|\
| * *.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason2017-06-161-4/+2
* | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ | |/ |/|
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-291-3/+5
|\ \
| * | show_worktree(): plug memory leakJohannes Schindelin2017-05-081-3/+5
| |/
* | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-161-2/+2
|\ \ | |/ |/|
| * timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-271-2/+2
* | Merge branch 'nd/worktree-add-lock'Junio C Hamano2017-04-261-4/+11
|\ \
| * | worktree add: add --lock optionnd/worktree-add-lockNguyễn Thái Ngọc Duy2017-04-201-4/+11
| |/
* | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-261-4/+2
|\ \ | |/ |/|
| * replace strbuf_addstr(git_path()) with git_path_buf()Jeff King2017-04-201-4/+2
* | prefix_filename: return newly allocated stringJeff King2017-03-211-1/+2
* | prefix_filename: drop length parameterJeff King2017-03-211-1/+1
|/
* Merge branch 'ps/worktree-prune-help-fix'Junio C Hamano2017-02-101-2/+2
|\
View Lorry Controller Status