diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
| commit | c2f3bf071ee90b01f2d629921bb04c4f798f02fa (patch) | |
| tree | 08ffe5b40e062d596deee47f3869278f4661a858 /Documentation/git-merge.txt | |
| parent | GIT 0.99.9n aka 1.0rc6 (diff) | |
| parent | Make "git-send-pack" less verbose by default (diff) | |
| download | git-1.0.0.tar.gz git-1.0.0.zip | |
GIT 1.0.0v1.0.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 0cac563d40..4ce799b520 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -37,6 +37,11 @@ include::merge-options.txt[] include::merge-strategies.txt[] +If you tried a merge which resulted in a complex conflicts and +would want to start over, you can recover with +gitlink:git-reset[1]. + + HOW MERGE WORKS --------------- |