summaryrefslogtreecommitdiff
path: root/builtin/reset.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/leak-checkers'Junio C Hamano2017-09-191-6/+16
|\
| * reset: free allocated tree buffersJeff King2017-09-061-5/+13
| * reset: make tree counting less confusingJeff King2017-09-061-3/+5
* | stop leaking lock structs in some simple casesjk/incore-lockfile-removalJeff King2017-09-061-3/+3
|/
* Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-2/+1
|\
| * submodule: remove gitmodules_configBrandon Williams2017-08-031-2/+0
| * add, reset: ensure submodules can be added or resetBrandon Williams2017-08-021-0/+1
* | tree-walk: convert fill_tree_descriptor() to object_idrs/object-idRené Scharfe2017-08-141-2/+2
|/
* sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-5/+5
* 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-27/+12
|\ \
| * | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-011-1/+9
| * | reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller2017-05-301-25/+2
| * | submodule recursing: do not write a config variable twiceStefan Beller2017-05-301-1/+1
* | | Merge branch 'bw/pathspec-sans-the-index'Junio C Hamano2017-05-301-1/+0
|\ \ \
| * | | pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAPBrandon Williams2017-05-121-1/+0
| | |/ | |/|
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-5/+5
|\ \ \ | |_|/ |/| |
| * | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-2/+2
| * | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-081-1/+1
| * | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-2/+2
| |/
* | builtin/reset: add --recurse-submodules switchsb/reset-recurse-submodulesStefan Beller2017-04-231-0/+30
|/
* delete_ref: accept a reflog message argumentKyle Meyer2017-02-201-1/+1
* hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-1/+1
* Merge branch 'js/reset-usage'Junio C Hamano2016-10-171-1/+1
|\
| * reset: fix usagejs/reset-usageJohannes Schindelin2016-10-111-1/+1
* | builtin/reset: convert to use struct object_idbrian m. carlson2016-09-071-26/+26
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-2/+2
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-2/+2
| |/
* | Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano2016-07-111-1/+1
|\ \
| * | reset --hard: skip blank lines when reporting the commit subjectjs/find-commit-subject-ignore-leading-blanksJohannes Schindelin2016-06-291-1/+1
* | | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspecJunio C Hamano2016-06-021-1/+1
| |/ |/|
* | Remove get_object_hash.brian m. carlson2015-11-201-1/+1
* | Convert struct object to object_idbrian m. carlson2015-11-201-14/+14
* | Add several uses of get_object_hash.brian m. carlson2015-11-201-1/+1
* | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-1/+1
|/
* lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
* Merge branch 'nd/split-index'Junio C Hamano2014-07-161-4/+3
|\
| * cache-tree: mark istate->cache_changed on prime_cache_tree()Nguyễn Thái Ngọc Duy2014-06-131-1/+1
| * read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-3/+2
* | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-021-2/+2
|\ \
| * | convert logmsg_reencode to get_commit_bufferJeff King2014-06-131-1/+1
| * | logmsg_reencode: return const bufferJeff King2014-06-121-1/+1
| |/
* | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-071-2/+4
|/
* Merge branch 'nd/reset-setup-worktree'Junio C Hamano2014-03-141-3/+4
|\
| * reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-181-3/+4
* | reset: support "--mixed --intent-to-add" modend/reset-intent-to-addNguyễn Thái Ngọc Duy2014-02-051-12/+28
|/
* reset: pass real rev name to add--interactivejk/reset-p-current-head-fixJeff King2013-10-251-1/+1
* Merge branch 'jk/trailing-slash-in-pathspec'Junio C Hamano2013-10-171-2/+6
|\
| * reset: handle submodule with trailing slashjk/trailing-slash-in-pathspecJohn Keeping2013-09-131-2/+6
View Lorry Controller Status