diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-30 00:03:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-30 00:03:52 -0700 |
| commit | bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2 (patch) | |
| tree | f766e0c08f08560d53336a2ee8fa469d9f877c70 /Documentation | |
| parent | 144dfc5c63dfe829aafdb2cba3bd549600b6008b (diff) | |
| parent | 7a45c313964e293f45384ca0a2ae1d326c83a061 (diff) | |
| download | git-bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2.tar.gz git-bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2.tar.xz | |
Merge branch 'bc/maint-api-doc-parked' into maint
* bc/maint-api-doc-parked:
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/technical/api-diff.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt index 20b0241d3..2d2ebc04b 100644 --- a/Documentation/technical/api-diff.txt +++ b/Documentation/technical/api-diff.txt @@ -32,7 +32,7 @@ Calling sequence * As you find different pairs of files, call `diff_change()` to feed modified files, `diff_addremove()` to feed created or deleted files, - or `diff_unmerged()` to feed a file whose state is 'unmerged' to the + or `diff_unmerge()` to feed a file whose state is 'unmerged' to the API. These are thin wrappers to a lower-level `diff_queue()` function that is flexible enough to record any of these kinds of changes. @@ -50,7 +50,7 @@ Data structures This is the internal representation for a single file (blob). It records the blob object name (if known -- for a work tree file it typically is a NUL SHA-1), filemode and pathname. This is what the -`diff_addremove()`, `diff_change()` and `diff_unmerged()` synthesize and +`diff_addremove()`, `diff_change()` and `diff_unmerge()` synthesize and feed `diff_queue()` function with. * `struct diff_filepair` |