aboutsummaryrefslogtreecommitdiff
path: root/builtin/reset.c
Commit message (Expand)AuthorAge
* Merge branch 'ot/pretty'Junio C Hamano2017-12-27
|\
| * format: create pretty.h fileOlga Telezhnaya2017-12-12
* | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-09
|\ \
| * | diff: make struct diff_flags members lowercaseBrandon Williams2017-11-01
| * | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-01
| * | add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams2017-10-31
| |/
* | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-16
* | refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson2017-10-16
|/
* Merge branch 'jk/leak-checkers'Junio C Hamano2017-09-19
|\
| * reset: free allocated tree buffersJeff King2017-09-06
| * reset: make tree counting less confusingJeff King2017-09-06
* | stop leaking lock structs in some simple casesJeff King2017-09-06
|/
* Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-26
|\
| * submodule: remove gitmodules_configBrandon Williams2017-08-03
| * add, reset: ensure submodules can be added or resetBrandon Williams2017-08-02
* | tree-walk: convert fill_tree_descriptor() to object_idRené Scharfe2017-08-14
|/
* sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-17
* Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-15
* | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-13
|\ \
| * | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-01
| * | reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller2017-05-30
| * | submodule recursing: do not write a config variable twiceStefan Beller2017-05-30
* | | Merge branch 'bw/pathspec-sans-the-index'Junio C Hamano2017-05-30
|\ \ \
| * | | pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAPBrandon Williams2017-05-12
| | |/ | |/|
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-29
|\ \ \ | |_|/ |/| |
| * | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-08
| * | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-08
| * | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08
| |/
* | builtin/reset: add --recurse-submodules switchStefan Beller2017-04-23
|/
* delete_ref: accept a reflog message argumentKyle Meyer2017-02-20
* hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-07
* Merge branch 'js/reset-usage'Junio C Hamano2016-10-17
|\
| * reset: fix usageJohannes Schindelin2016-10-11
* | builtin/reset: convert to use struct object_idbrian m. carlson2016-09-07
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-19
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-28
| |/
* | Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano2016-07-11
|\ \
| * | reset --hard: skip blank lines when reporting the commit subjectJohannes Schindelin2016-06-29
* | | pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano2016-06-02
| |/ |/|
* | Remove get_object_hash.brian m. carlson2015-11-20
* | Convert struct object to object_idbrian m. carlson2015-11-20
* | Add several uses of get_object_hash.brian m. carlson2015-11-20
* | memoize common git-path "constant" filesJeff King2015-08-10
|/
* lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
* Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\
| * cache-tree: mark istate->cache_changed on prime_cache_tree()Nguyễn Thái Ngọc Duy2014-06-13
| * read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-13
* | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-02
|\ \
| * | convert logmsg_reencode to get_commit_bufferJeff King2014-06-13