summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/lose-leak-pending' into maintJunio C Hamano2018-02-151-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
| * | | unpack-trees: don't respect submodule.updateBrandon Williams2017-08-031-1/+1
| |/ /
* | | Merge branch 'ls/filter-process-delayed'Junio C Hamano2017-08-111-0/+3
|\ \ \ | |/ / |/| / | |/
| * convert: add "status=delayed" to filter process protocolLars Schneider2017-06-301-0/+3
* | 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 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-131-28/+3
|\ \ \ | |_|/ |/| |
| * | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-011-1/+1
| * | reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller2017-05-301-26/+1
| * | submodule recursing: do not write a config variable twiceStefan Beller2017-05-301-1/+1
* | | Merge branch 'ja/do-not-ask-needless-questions'Junio C Hamano2017-05-291-3/+2
|\ \ \
| * | | usability: don't ask questions if no reply is requiredJean-Noel Avila2017-05-121-3/+2
* | | | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-291-8/+10
|\ \ \ \
| * | | | checkout: fix memory leakjs/plug-leaksJunio C Hamano2017-05-091-0/+1
| * | | | checkout: fix memory leakJohannes Schindelin2017-05-081-8/+9
| | |_|/ | |/| |
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-9/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-4/+4
| * | | revision: rename add_pending_sha1 to add_pending_oidbrian m. carlson2017-05-081-2/+2
| * | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-3/+3
| |/ /
* | | Merge branch 'rs/checkout-am-fix-unborn'Junio C Hamano2017-05-231-1/+2
|\ \ \ | |/ / |/| |
| * | checkout: check return value of resolve_refdup before using hashRené Scharfe2017-05-081-1/+2
| |/
View Lorry Controller Status