undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/maint-api-doc-parked' into maint

Browse Source 
* bc/maint-api-doc-parked:
  Documentation/technical/api-diff.txt: correct name of diff_unmerge()
This commit is contained in:
Junio C Hamano 2011-05-30 00:03:52 -07:00
commit bcb477fb60
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/technical/api-diff.txt
View File

@ -32,7 +32,7 @@ Calling sequence
* As you find different pairs of files, call `diff_change()` to feed * As you find different pairs of files, call `diff_change()` to feed
modified files, `diff_addremove()` to feed created or deleted files, 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 API. These are thin wrappers to a lower-level `diff_queue()` function
that is flexible enough to record any of these kinds of changes. 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 This is the internal representation for a single file (blob). It
records the blob object name (if known -- for a work tree file 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 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. feed `diff_queue()` function with.
* `struct diff_filepair` * `struct diff_filepair`