diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-16 18:23:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-16 18:23:33 -0800 |
| commit | 3ae854c3567dd10055fbe12b8bd91bd2d447f55f (patch) | |
| tree | f8d2941739838b2dfedbaa271cbabc81a6c890d4 /Documentation/git-commit.txt | |
| parent | 06bf6ac4248e834a229027908d405f5e42ac96d7 (diff) | |
| download | git-3ae854c3567dd10055fbe12b8bd91bd2d447f55f.tar.gz | |
Examples of resetting.
Morten Welinder says examples of resetting is really about
recovering from botched commit/pulls. I agree that pointers
from commands that cause a reset to be needed in the first place
would be very helpful.
Also reset examples did not mention "pull/merge" cases.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index b92cf48315..8b91f221fe 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -66,6 +66,10 @@ OPTIONS Update specified paths in the index file before committing. +If you make a commit and then found a mistake immediately after +that, you can recover from it with gitlink:git-reset[1]. + + Author ------ Written by Linus Torvalds <torvalds@osdl.org> and |