summaryrefslogtreecommitdiff
path: root/builtin/reset.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'bk/refs-multi-update'Junio C Hamano2013-09-201-2/+2
|\ \
| * | reset: rename update_refs to reset_refsBrad King2013-08-301-2/+2
* | | Merge branch 'fc/trivial'Junio C Hamano2013-09-171-7/+4
|\ \ \ | |_|/ |/| |
| * | reset: trivial style cleanupFelipe Contreras2013-08-301-1/+1
| * | reset: trivial refactoringFelipe Contreras2013-08-301-6/+3
| |/
* | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-13/+20
|\ \
| * | remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-151-4/+5
| * | convert run_add_interactive to use struct pathspecNguyễn Thái Ngọc Duy2013-07-151-4/+4
| * | reset: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-10/+16
| |/
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-1/+1
|/
* pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-261-1/+4
* reset: update documentation to require only tree-ish with pathsMartin von Zweigbergk2013-01-161-2/+2
* reset [--mixed]: use diff-based reset whether or not pathspec was givenMartin von Zweigbergk2013-01-151-1/+1
* reset: allow reset on unborn branchMartin von Zweigbergk2013-01-151-6/+10
* reset $sha1 $pathspec: require $sha1 only to be treeishMartin von Zweigbergk2013-01-151-21/+27
* reset.c: inline update_index_refresh()Martin von Zweigbergk2013-01-151-9/+5
* reset.c: finish entire cmd_reset() whether or not pathspec is givenMartin von Zweigbergk2013-01-151-24/+18
* reset [--mixed]: only write index file onceMartin von Zweigbergk2013-01-151-9/+5
* reset.c: move lock, write and commit out of update_index_refresh()Martin von Zweigbergk2013-01-151-16/+18
* reset.c: move update_index_refresh() call out of read_from_tree()Martin von Zweigbergk2013-01-151-9/+9
* reset.c: replace switch by if-elseMartin von Zweigbergk2013-01-151-10/+3
* reset: avoid redundant error messageMartin von Zweigbergk2013-01-151-5/+3
* reset --keep: only write index file onceMartin von Zweigbergk2013-01-151-11/+10
* reset.c: share call to die_if_unmerged_cache()Martin von Zweigbergk2013-01-151-8/+6
* reset.c: extract function for updating {ORIG_,}HEADMartin von Zweigbergk2013-01-151-16/+23
* reset.c: remove unnecessary variable 'i'Martin von Zweigbergk2013-01-151-17/+16
* reset.c: extract function for parsing argumentsMartin von Zweigbergk2013-01-151-32/+38
* reset: don't allow "git reset -- $pathspec" in bare repoMartin von Zweigbergk2013-01-151-2/+4
* reset.c: pass pathspec around instead of (prefix, argv) pairMartin von Zweigbergk2013-01-151-17/+10
* reset $pathspec: exit with code 0 if successfulMartin von Zweigbergk2013-01-151-5/+3
* reset $pathspec: no need to discard indexMartin von Zweigbergk2013-01-151-15/+1
* i18n: reset: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-10/+10
* Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-221-2/+8
|\
| * reset: the command takes committishJunio C Hamano2012-07-091-2/+8
* | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-181-1/+1
|/
* reset: update cache-tree data when appropriateThomas Rast2011-12-061-0/+7
View Lorry Controller Status