summaryrefslogtreecommitdiff
path: root/builtin/reset.c
AgeCommit message (Expand)AuthorFilesLines
2014-03-14Merge branch 'nd/reset-setup-worktree'Libravatar Junio C Hamano1-3/+4
2014-02-18reset: optionally setup worktree and refresh index on --mixedLibravatar Nguyễn Thái Ngọc Duy1-3/+4
2014-02-05reset: support "--mixed --intent-to-add" modeLibravatar Nguyễn Thái Ngọc Duy1-12/+28
2013-10-25reset: pass real rev name to add--interactiveLibravatar Jeff King1-1/+1
2013-10-17Merge branch 'jk/trailing-slash-in-pathspec'Libravatar Junio C Hamano1-2/+6
2013-09-20Merge branch 'bk/refs-multi-update'Libravatar Junio C Hamano1-2/+2
2013-09-17Merge branch 'fc/trivial'Libravatar Junio C Hamano1-7/+4
2013-09-13reset: handle submodule with trailing slashLibravatar John Keeping1-2/+6
2013-09-09Merge branch 'jl/submodule-mv'Libravatar Junio C Hamano1-13/+20
2013-08-30reset: trivial style cleanupLibravatar Felipe Contreras1-1/+1
2013-08-30reset: trivial refactoringLibravatar Felipe Contreras1-6/+3
2013-08-30reset: rename update_refs to reset_refsLibravatar Brad King1-2/+2
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLLibravatar Stefan Beller1-1/+1
2013-07-15remove diff_tree_{setup,release}_pathsLibravatar Nguyễn Thái Ngọc Duy1-4/+5
2013-07-15convert run_add_interactive to use struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-4/+4
2013-07-15reset: convert to use parse_pathspecLibravatar Nguyễn Thái Ngọc Duy1-10/+16
2013-06-26pretty: --format output should honor logOutputEncodingLibravatar Alexey Shumkin1-1/+4
2013-01-16reset: update documentation to require only tree-ish with pathsLibravatar Martin von Zweigbergk1-2/+2
2013-01-15reset [--mixed]: use diff-based reset whether or not pathspec was givenLibravatar Martin von Zweigbergk1-1/+1
2013-01-15reset: allow reset on unborn branchLibravatar Martin von Zweigbergk1-6/+10
2013-01-15reset $sha1 $pathspec: require $sha1 only to be treeishLibravatar Martin von Zweigbergk1-21/+27
2013-01-15reset.c: inline update_index_refresh()Libravatar Martin von Zweigbergk1-9/+5
2013-01-15reset.c: finish entire cmd_reset() whether or not pathspec is givenLibravatar Martin von Zweigbergk1-24/+18
2013-01-15reset [--mixed]: only write index file onceLibravatar Martin von Zweigbergk1-9/+5
2013-01-15reset.c: move lock, write and commit out of update_index_refresh()Libravatar Martin von Zweigbergk1-16/+18
2013-01-15reset.c: move update_index_refresh() call out of read_from_tree()Libravatar Martin von Zweigbergk1-9/+9
2013-01-15reset.c: replace switch by if-elseLibravatar Martin von Zweigbergk1-10/+3
2013-01-15reset: avoid redundant error messageLibravatar Martin von Zweigbergk1-5/+3
2013-01-15reset --keep: only write index file onceLibravatar Martin von Zweigbergk1-11/+10
2013-01-15reset.c: share call to die_if_unmerged_cache()Libravatar Martin von Zweigbergk1-8/+6
2013-01-15reset.c: extract function for updating {ORIG_,}HEADLibravatar Martin von Zweigbergk1-16/+23
2013-01-15reset.c: remove unnecessary variable 'i'Libravatar Martin von Zweigbergk1-17/+16
2013-01-15reset.c: extract function for parsing argumentsLibravatar Martin von Zweigbergk1-32/+38
2013-01-15reset: don't allow "git reset -- $pathspec" in bare repoLibravatar Martin von Zweigbergk1-2/+4
2013-01-15reset.c: pass pathspec around instead of (prefix, argv) pairLibravatar Martin von Zweigbergk1-17/+10
2013-01-15reset $pathspec: exit with code 0 if successfulLibravatar Martin von Zweigbergk1-5/+3
2013-01-15reset $pathspec: no need to discard indexLibravatar Martin von Zweigbergk1-15/+1
2012-08-20i18n: reset: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-10/+10
2012-07-22Merge branch 'jc/sha1-name-more'Libravatar Junio C Hamano1-2/+8
2012-07-09reset: the command takes committishLibravatar Junio C Hamano1-2/+8
2012-06-18verify_filename(): ask the caller to chose the kind of diagnosisLibravatar Matthieu Moy1-1/+1
2011-12-06reset: update cache-tree data when appropriateLibravatar Thomas Rast1-0/+7
2011-08-08Merge branch 'jk/reset-reflog-message-fix'Libravatar Junio C Hamano1-33/+16
2011-07-22reset: give better reflog messagesLibravatar Jeff King1-33/+16
2011-07-13reset [<commit>] paths...: do not mishandle unmerged pathsLibravatar Junio C Hamano1-1/+1
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-21/+21
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2011-03-09i18n: git-reset "Unstaged changes after reset" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-reset reset_type_names messagesLibravatar Ævar Arnfjörð Bjarmason1-7/+7
2011-03-09i18n: git-reset basic messagesLibravatar Ævar Arnfjörð Bjarmason1-13/+13