summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/completion-negation'Junio C Hamano2018-06-281-4/+6
|\
| * completion: suppress some -no- optionsNguyễn Thái Ngọc Duy2018-05-291-4/+6
* | Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano2018-05-301-0/+1
|\ \ | |/ |/|
| * unpack_trees_options: free messages when doneMartin Ågren2018-05-221-0/+1
* | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-6/+12
|\ \ | |/ |/|
| * treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-6/+12
| * treewide: rename tree to maybe_treeDerrick Stolee2018-04-111-6/+6
| * Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano2018-04-111-98/+98
| |\
* | \ Merge branch 'bc/object-id'Junio C Hamano2018-04-101-6/+6
|\ \ \
| * | | Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-3/+3
| * | | strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson2018-03-141-1/+1
| * | | tree: convert read_tree_recursive to struct object_idbrian m. carlson2018-03-141-2/+2
* | | | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-141-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | completion: use __gitcomp_builtin in _git_checkoutNguyễn Thái Ngọc Duy2018-02-091-2/+5
| * | | parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy2018-02-091-1/+1
* | | | Merge branch 'jh/status-no-ahead-behind'Junio C Hamano2018-03-081-1/+1
|\ \ \ \
| * | | | status: support --no-ahead-behind in long formatjh/status-no-ahead-behindJeff Hostetler2018-01-241-1/+1
* | | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-98/+98
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | checkout: rename 'new' variablesBrandon Williams2018-02-221-98/+98
| | |/ | |/|
* | | sha1_file: convert write_sha1_file to object_idPatryk Obara2018-01-301-2/+1
|/ /
* | Merge branch 'rs/lose-leak-pending'Junio C Hamano2018-01-231-12/+1
|\ \ | |/ |/|
| * checkout: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-12/+1
* | Merge branch 'ks/branch-cleanup'Junio C Hamano2017-12-271-1/+1
|\ \
| * | branch: group related arguments of create_branch()Kaartic Sivaraam2017-12-071-1/+1
* | | Merge branch 'ar/unconfuse-three-dots'Junio C Hamano2017-12-191-2/+8
|\ \ \
| * | | checkout: describe_detached_head: remove ellipsis after committishAnn T Ropea2017-12-061-2/+8
* | | | Merge branch 'tg/worktree-create-tracking'Junio C Hamano2017-12-191-40/+1
|\ \ \ \
| * | | | checkout: factor out functions to new lib fileThomas Gummerer2017-11-271-40/+1
| | |/ / | |/| |
* | | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-1/+1
|\ \ \ \
| * | | | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
| | |/ / | |/| |
* | | | Merge branch 'jc/branch-name-sanity'Junio C Hamano2017-11-281-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | branch: split validate_new_branchname() into twoJunio C Hamano2017-10-131-5/+5
| | |/ | |/|
* | | Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano2017-11-151-1/+1
|\ \ \ | |_|/ |/| |
| * | refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty2017-11-061-1/+1
* | | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-5/+5
|\ \ \ | |/ /
| * | refs: convert read_ref and read_ref_full to object_idbrian m. carlson2017-10-161-3/+3
| * | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-161-1/+1
| * | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-161-1/+1
| |/
* | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-8/+6
|\ \ | |/ |/|
| * treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-8/+6
* | Merge branch 'ma/builtin-unleak'Junio C Hamano2017-10-071-0/+1
|\ \
| * | builtin/: add UNLEAKsma/builtin-unleakMartin Ågren2017-10-021-0/+1
* | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-10-051-2/+1
|\ \ \ | |_|/ |/| |
| * | refs: pass NULL to resolve_refdup() if hash is not neededrs/resolve-ref-optional-resultRené Scharfe2017-10-011-2/+1
* | | Merge branch 'ma/leakplugs'Junio C Hamano2017-09-291-1/+8
|\ \ \
| * | | leak_pending: use `object_array_clear()`, not `free()`Martin Ågren2017-09-241-1/+8
| | |/ | |/|
| * | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-261-0/+3
| |\ \
* | | | consistently use "fallthrough" comments in switchesjk/fallthroughJeff King2017-09-221-0/+1
| |_|/ |/| |
* | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-2/+1
|\ \ \
| * | | submodule: remove gitmodules_configBrandon Williams2017-08-031-1/+0