aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/reset.c
AgeCommit message (Expand)AuthorFilesLines
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano1-1/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller1-1/+1
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller1-1/+1
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-2/+2
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-1/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-1/+1
2018-05-02builtin/reset: convert use of EMPTY_TREE_SHA1_BINbrian m. carlson1-1/+1
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson1-1/+1
2018-02-15Merge branch 'tg/reset-hard-show-head-with-pretty'Junio C Hamano1-18/+10
2018-02-02reset --hard: make use of the pretty machineryThomas Gummerer1-18/+10
2017-12-27Merge branch 'ot/pretty'Junio C Hamano1-1/+1
2017-12-12format: create pretty.h fileOlga Telezhnaya1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-1/+1
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-1/+1
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-1/+1
2017-10-31add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson1-2/+2
2017-10-16refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson1-1/+1
2017-09-19Merge branch 'jk/leak-checkers'Junio C Hamano1-6/+16
2017-09-06reset: free allocated tree buffersJeff King1-5/+13
2017-09-06reset: make tree counting less confusingJeff King1-3/+5
2017-09-06stop leaking lock structs in some simple casesJeff King1-3/+3
2017-08-26Merge branch 'bw/submodule-config-cleanup'Junio C Hamano1-2/+1
2017-08-14tree-walk: convert fill_tree_descriptor() to object_idRené Scharfe1-2/+2
2017-08-03submodule: remove gitmodules_configBrandon Williams1-2/+0
2017-08-02add, reset: ensure submodules can be added or resetBrandon Williams1-0/+1
2017-07-17sha1_name: convert get_sha1* to get_oid*brian m. carlson1-5/+5
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano1-27/+12
2017-06-01Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller1-1/+9
2017-05-30reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller1-25/+2
2017-05-30submodule recursing: do not write a config variable twiceStefan Beller1-1/+1
2017-05-30Merge branch 'bw/pathspec-sans-the-index'Junio C Hamano1-1/+0
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-5/+5
2017-05-12pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAPBrandon Williams1-1/+0
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson1-2/+2
2017-05-08diff-lib: convert do_diff_cache to struct object_idbrian m. carlson1-1/+1
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-2/+2
2017-04-23builtin/reset: add --recurse-submodules switchStefan Beller1-0/+30
2017-02-20delete_ref: accept a reflog message argumentKyle Meyer1-1/+1
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano1-1/+1
2016-10-17Merge branch 'js/reset-usage'Junio C Hamano1-1/+1
2016-10-11reset: fix usageJohannes Schindelin1-1/+1
2016-09-07builtin/reset: convert to use struct object_idbrian m. carlson1-26/+26
2016-07-19Merge branch 'bc/cocci'Junio C Hamano1-2/+2
2016-07-11Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano1-1/+1
2016-06-29reset --hard: skip blank lines when reporting the commit subjectJohannes Schindelin1-1/+1
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson1-2/+2
2016-06-02pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano1-1/+1
2015-11-20Remove get_object_hash.brian m. carlson1-1/+1
2015-11-20Convert struct object to object_idbrian m. carlson1-14/+14
2015-11-20Add several uses of get_object_hash.brian m. carlson1-1/+1
2015-08-10memoize common git-path "constant" filesJeff King1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-4/+3
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano1-2/+2
2014-06-13convert logmsg_reencode to get_commit_bufferJeff King1-1/+1
2014-06-13cache-tree: mark istate->cache_changed on prime_cache_tree()Nguyễn Thái Ngọc Duy1-1/+1
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-3/+2
2014-06-12logmsg_reencode: return const bufferJeff King1-1/+1
2014-04-07refs.h: rename the action_on_err constantsMichael Haggerty1-2/+4
2014-03-14Merge branch 'nd/reset-setup-worktree'Junio C Hamano1-3/+4
2014-02-18reset: optionally setup worktree and refresh index on --mixedNguyễn Thái Ngọc Duy1-3/+4
2014-02-05reset: support "--mixed --intent-to-add" modeNguyễn Thái Ngọc Duy1-12/+28
2013-10-25reset: pass real rev name to add--interactiveJeff King1-1/+1
2013-10-17Merge branch 'jk/trailing-slash-in-pathspec'Junio C Hamano1-2/+6
2013-09-20Merge branch 'bk/refs-multi-update'Junio C Hamano1-2/+2
2013-09-17Merge branch 'fc/trivial'Junio C Hamano1-7/+4
2013-09-13reset: handle submodule with trailing slashJohn Keeping1-2/+6
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-13/+20
2013-08-30reset: trivial style cleanupFelipe Contreras1-1/+1
2013-08-30reset: trivial refactoringFelipe Contreras1-6/+3
2013-08-30reset: rename update_refs to reset_refsBrad King1-2/+2
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller1-1/+1
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy1-4/+5
2013-07-15convert run_add_interactive to use struct pathspecNguyễn Thái Ngọc Duy1-4/+4
2013-07-15reset: convert to use parse_pathspecNguyễn Thái Ngọc Duy1-10/+16
2013-06-26pretty: --format output should honor logOutputEncodingAlexey Shumkin1-1/+4
2013-01-16reset: update documentation to require only tree-ish with pathsMartin von Zweigbergk1-2/+2
2013-01-15reset [--mixed]: use diff-based reset whether or not pathspec was givenMartin von Zweigbergk1-1/+1
2013-01-15reset: allow reset on unborn branchMartin von Zweigbergk1-6/+10
2013-01-15reset $sha1 $pathspec: require $sha1 only to be treeishMartin von Zweigbergk1-21/+27
2013-01-15reset.c: inline update_index_refresh()Martin von Zweigbergk1-9/+5
2013-01-15reset.c: finish entire cmd_reset() whether or not pathspec is givenMartin von Zweigbergk1-24/+18
2013-01-15reset [--mixed]: only write index file onceMartin von Zweigbergk1-9/+5
2013-01-15reset.c: move lock, write and commit out of update_index_refresh()Martin von Zweigbergk1-16/+18
2013-01-15reset.c: move update_index_refresh() call out of read_from_tree()Martin von Zweigbergk1-9/+9
2013-01-15reset.c: replace switch by if-elseMartin von Zweigbergk1-10/+3
2013-01-15reset: avoid redundant error messageMartin von Zweigbergk1-5/+3
2013-01-15reset --keep: only write index file onceMartin von Zweigbergk1-11/+10
2013-01-15reset.c: share call to die_if_unmerged_cache()Martin von Zweigbergk1-8/+6
2013-01-15reset.c: extract function for updating {ORIG_,}HEADMartin von Zweigbergk1-16/+23
2013-01-15reset.c: remove unnecessary variable 'i'Martin von Zweigbergk1-17/+16
2013-01-15reset.c: extract function for parsing argumentsMartin von Zweigbergk1-32/+38
2013-01-15reset: don't allow "git reset -- $pathspec" in bare repoMartin von Zweigbergk1-2/+4
2013-01-15reset.c: pass pathspec around instead of (prefix, argv) pairMartin von Zweigbergk1-17/+10
2013-01-15reset $pathspec: exit with code 0 if successfulMartin von Zweigbergk1-5/+3
2013-01-15reset $pathspec: no need to discard indexMartin von Zweigbergk1-15/+1
2012-08-20i18n: reset: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-10/+10
2012-07-22Merge branch 'jc/sha1-name-more'Junio C Hamano1-2/+8
2012-07-09reset: the command takes committishJunio C Hamano1-2/+8
2012-06-18verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy1-1/+1
2011-12-06reset: update cache-tree data when appropriateThomas Rast1-0/+7
2011-08-08Merge branch 'jk/reset-reflog-message-fix'Junio C Hamano1-33/+16
2011-07-22reset: give better reflog messagesJeff King1-33/+16
2011-07-13reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano1-1/+1
2011-04-01Merge branch 'ab/i18n-st'Junio C Hamano1-21/+21
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2011-03-09i18n: git-reset "Unstaged changes after reset" messageÆvar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-reset reset_type_names messagesÆvar Arnfjörð Bjarmason1-7/+7
2011-03-09i18n: git-reset basic messagesÆvar Arnfjörð Bjarmason1-13/+13
2010-11-15Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder1-1/+1
2010-11-15add description parameter to OPT__QUIETRené Scharfe1-1/+1
2010-08-21reset: suggest what to do upon "git reset --mixed <paths>"Ævar Arnfjörð Bjarmason1-1/+1
2010-03-31Sync with 1.7.0.4Junio C Hamano1-1/+2
2010-03-20Merge branch 'cc/reset-keep'Junio C Hamano1-9/+38
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+356