W dniu 26.04.2013 16:34, Marcin napisał(a):
W dniu 26 kwietnia 2013 16:25 użytkownik Tomasz Chiliński tomasz.chilinski@chilan.com napisał:
W dniu 26.04.2013 16 [1]:07, Marcin napisał(a):
http://stackoverflow.com/questions/1463340/revert-multiple-git-commits [2] Zwłaszcza polecam odpowiedź ze 168 pozytywnymi komentarzami.
hmm, jak robię reset --hard SHA to jak najbardziej przywraca mi, z tym że nie z mojego brancha tylko z mastera :/
Z man git-reset: git reset [<mode>] [<commit>] This form resets the current branch head to <commit> and possibly updates the index (resetting it to the tree of <commit>) and the working tree depending on <mode>. If <mode> is omitted, defaults to "--mixed". The <mode> must be one of the following:
--soft Does not touch the index file nor the working tree at all (but resets the head to <commit>, just like all modes do). This leaves all your changed files "Changes to be committed", as git status would put it.
--mixed Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action.
--hard Resets the index and working tree. Any changes to tracked files in the working tree since <commit> are discarded.
--merge Resets the index and updates the files in the working tree that are different between <commit> and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between <commit> and the index has unstaged changes, reset is aborted.
In other words, --merge does something like a git read-tree -u -m <commit>, but carries forward unmerged index entries.
--keep Resets index entries and updates files in the working tree that are different between <commit> and HEAD. If a file that is different between <commit> and HEAD has local changes, reset is aborted.
Jaką masz aktywną gałąź, gdy robisz git reset?
-- Pozdrawiam Marcin / nicraM