diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-29 10:34:22 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-29 10:34:22 +0000 |
commit | bbbb865819d5387ef9ee747115b30b5d2dc7e67b (patch) | |
tree | c511e4696dcc9826712e7808904299c97d70d250 /git-reset.txt | |
parent | 2fa431bf8e4db588a1905a08086bc88c5e476bb4 (diff) | |
download | git-htmldocs-bbbb865819d5387ef9ee747115b30b5d2dc7e67b.tar.gz |
Autogenerated HTML docs for v1.6.1-28-gc32f76
Diffstat (limited to 'git-reset.txt')
-rw-r--r-- | git-reset.txt | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/git-reset.txt b/git-reset.txt index 2049f3d97..abb25d1c0 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -8,7 +8,7 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git reset' [--mixed | --soft | --hard] [-q] [<commit>] +'git reset' [--mixed | --soft | --hard | --merge] [-q] [<commit>] 'git reset' [-q] [<commit>] [--] <paths>... DESCRIPTION @@ -45,6 +45,11 @@ OPTIONS switched to. Any changes to tracked files in the working tree since <commit> are lost. +--merge:: + Resets the index to match the tree recorded by the named commit, + and updates the files that are different between the named commit + and the current commit in the working tree. + -q:: Be quiet, only report errors. @@ -152,6 +157,28 @@ tip of the current branch in ORIG_HEAD, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit. +Undo a merge or pull inside a dirty work tree:: ++ +------------ +$ git pull <1> +Auto-merging nitfol +Merge made by recursive. + nitfol | 20 +++++---- + ... +$ git reset --merge ORIG_HEAD <2> +------------ ++ +<1> Even if you may have local modifications in your +working tree, you can safely say "git pull" when you know +that the change in the other branch does not overlap with +them. +<2> After inspecting the result of the merge, you may find +that the change in the other branch is unsatisfactory. Running +"git reset --hard ORIG_HEAD" will let you go back to where you +were, but it will discard your local changes, which you do not +want. "git reset --merge" keeps your local changes. + + Interrupted workflow:: + Suppose you are interrupted by an urgent fix request while you |