summaryrefslogtreecommitdiff
path: root/builtin/reset.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'jk/reset-reflog-message-fix'Junio C Hamano2011-08-081-33/+16
|\
| * reset: give better reflog messagesJeff King2011-07-221-33/+16
* | reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano2011-07-131-1/+1
|/
* Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-21/+21
|\
| * i18n: git-reset "Unstaged changes after reset" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
| * i18n: git-reset reset_type_names messagesÆvar Arnfjörð Bjarmason2011-03-091-7/+7
| * i18n: git-reset basic messagesÆvar Arnfjörð Bjarmason2011-03-091-13/+13
* | Fix sparse warningsStephen Boyd2011-03-221-1/+1
|/
* Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder2010-11-151-1/+1
* add description parameter to OPT__QUIETRené Scharfe2010-11-151-1/+1
* reset: suggest what to do upon "git reset --mixed <paths>"Ævar Arnfjörð Bjarmason2010-08-211-1/+1
* Sync with 1.7.0.4Junio C Hamano2010-03-311-1/+2
* Merge branch 'cc/reset-keep'Junio C Hamano2010-03-201-9/+38
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+356