summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
| * Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano2017-03-281-1/+1
| |\
* | | avoid using fixed PATH_MAX buffers for refsJeff King2017-03-301-3/+2
* | | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-281-0/+28
|\ \ \
| * | | builtin/checkout: add --recurse-submodules switchStefan Beller2017-03-161-0/+28
| |/ /
* | | Merge branch 'jk/interpret-branch-name'Junio C Hamano2017-03-141-1/+1
|\ \ \ | |/ / |/| / | |/
| * checkout: restrict @-expansions when finding branchjk/interpret-branch-nameJeff King2017-03-021-1/+1
| * interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-021-1/+1
* | Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano2017-02-031-4/+7
|\ \
| * | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-311-4/+7
* | | checkout: convert post_checkout_hook() to struct object_idRené Scharfe2017-01-301-2/+2
|/ /
* | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-2/+2
|/
* Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano2016-11-171-1/+1
|\
| * create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-091-1/+1
| * Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-081-2/+1
| |\
* | \ Merge branch 'rs/checkout-init-macro'Junio C Hamano2016-09-261-2/+1
|\ \ \
| * | | introduce CHECKOUT_INITrs/checkout-init-macroRené Scharfe2016-09-221-2/+1
* | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-261-1/+1
|\ \ \ \
| * | | | add: modify already added files when --chmod is givenThomas Gummerer2016-09-151-1/+1
* | | | | Merge branch 'nd/checkout-disambiguation'Junio C Hamano2016-09-261-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguationNguyễn Thái Ngọc Duy2016-09-211-2/+2
| * | | | checkout: add some spaces between code and commentNguyễn Thái Ngọc Duy2016-09-081-1/+1
* | | | | Merge branch 'rs/checkout-some-states-are-const'Junio C Hamano2016-09-211-3/+3
|\ \ \ \ \
View Lorry Controller Status