summaryrefslogtreecommitdiff
path: root/src/reset.c
Commit message (Expand)AuthorAgeFilesLines
* reset: perform the checkout before moving HEAD or the indexcmn/reset-dir-fileCarlos Martín Nieto2015-12-091-6/+6
* diff/status: introduce conflictsEdward Thomson2015-05-281-0/+1
* reset: `git_checkout_options` is `const`Edward Thomson2015-04-201-3/+3
* Add annotated commit versions of reflog-modifying functionsCarlos Martín Nieto2015-03-161-2/+22
* Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARDPierre-Olivier Latour2015-03-081-1/+1
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-8/+5
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-2/+1
* git_reset: const the git_signature argEdward Thomson2014-10-261-1/+1
* Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-0/+4
* Fix reset for staged deletesRussell Belfer2014-04-211-3/+8
* Merge pull request #2028 from libgit2/options-namesVicent Marti2014-03-071-1/+1
|\
| * git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-1/+1
* | Plug a few leaks in the testsCarlos Martín Nieto2014-03-071-0/+1
|/
* Add reflog parameters to git_resetBen Straub2014-02-031-2/+10
* diff: rename the file's 'oid' to 'id'Carlos Martín Nieto2014-01-251-1/+1
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-1/+1
* refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-151-1/+1
* clean up state metadata more consistentlyEdward Thomson2013-12-021-1/+1
* Merge pull request #1897 from libgit2/split-patch-from-diffVicent Martí2013-10-221-5/+6
|\
| * Diff API cleanupRussell Belfer2013-10-151-3/+4
| * Rename diff objects and split patch.hRussell Belfer2013-10-111-2/+2
* | checkout (from index) can write conflictsEdward Thomson2013-10-161-1/+1
|/
* Fix trailing whitespacesnulltoken2013-05-151-1/+1
* immutable references and a pluggable ref databaseEdward Thomson2013-03-071-40/+3
* reset: Introduce git_reset_default()nulltoken2013-02-051-0/+74
* update copyrightsEdward Thomson2013-01-081-1/+1
* reset: Fix a memory leaknulltoken2013-01-061-2/+1
* Reorder operations in git resetRussell Belfer2013-01-041-39/+30
* reset: Cannot soft reset with a conflicted indexnulltoken2013-01-041-42/+24
* expose merge metadata cleanupEdward Thomson2013-01-031-1/+1
* Deploy GIT_CHECKOUT_OPTS_INITBen Straub2012-11-301-2/+1
* Updates to reset.hRussell Belfer2012-11-271-1/+1
* Rename ref and reflog apis for consistencyBen Straub2012-11-271-3/+3
* Add explicit git_index ptr to diff and checkoutRussell Belfer2012-11-141-1/+1
* Rework checkout with new strategy optionsRussell Belfer2012-11-091-4/+1
* Merge pull request #990 from ben/clone-callbacksVicent Martí2012-10-251-2/+2
|\
| * index: remove read_tree() progress indicatornulltoken2012-10-191-1/+1
| * Convert checkout_index to use progress callbackBen Straub2012-10-191-1/+1
* | GIT_EUNMERGEDEdward Thomson2012-10-241-0/+1
* | reset changes for mergeEdward Thomson2012-10-241-0/+12
* | reset: make git_reset() cope with an orphaned HEADnulltoken2012-10-221-6/+40
|/
* reset: prevent hard reset in a bare repositorynulltoken2012-10-151-3/+5
* reset: make reset rely on git_repository_head()nulltoken2012-10-071-1/+6
* checkout: segregate checkout strategiesnulltoken2012-09-171-1/+8
* reset: add support for GIT_RESET_HARD modenulltoken2012-09-171-1/+14
* errors: deploy GIT_EBAREREPO usagenulltoken2012-09-061-2/+3
* Make git_object_peel a bit smarterRussell Belfer2012-08-271-25/+5
* Enable stats on git_index_read_tree.Ben Straub2012-07-301-1/+1
* Add git_reset()nulltoken2012-06-071-0/+103