diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-02-14 07:23:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-02-14 07:23:58 +0000 |
| commit | 053827fc208a615853d69ff66269e9c1600b7fa0 (patch) | |
| tree | 8c0e18f41368070a515bd63482c1fcae9bf3528c /user-manual.txt | |
| parent | 4b0130fa1a667a1c3bf0d3d7e810c6a536cf580f (diff) | |
| download | git-htmldocs-053827fc208a615853d69ff66269e9c1600b7fa0.tar.gz | |
Autogenerated HTML docs for v1.5.0-19-gddff
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user-manual.txt b/user-manual.txt index c5e9ea8a4..03736bbcd 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -2755,7 +2755,7 @@ stages to temporary files and calls a "merge" script on it: $ git-merge-index git-merge-one-file hello.c ------------------------------------------------- -and that is what higher level `git resolve` is implemented with. +and that is what higher level `git merge -s resolve` is implemented with. How git stores objects efficiently: pack files ---------------------------------------------- |