projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.
[git.git]
/
Documentation
/
git.txt
diff --git
a/Documentation/git.txt
b/Documentation/git.txt
index
e8ef3ef
..
2d0ca9d
100644
(file)
--- a/
Documentation/git.txt
+++ b/
Documentation/git.txt
@@
-313,6
+313,9
@@
gitlink:git-rebase[1]::
gitlink:git-repack[1]::
Pack unpacked objects in a repository.
+gitlink:git-rerere[1]::
+ Reuse recorded resolution of conflicted merges.
+
gitlink:git-reset[1]::
Reset current HEAD to the specified state.