diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:35:22 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:35:22 -0700 |
| commit | 58c2b1c4218a2f90ee2745687f2e17670bde0b1b (patch) | |
| tree | e00cd7afb7c5cac057e1d051f68bb690258a0a09 /include | |
| parent | ac584fcfd3e15b0a0200ee609bf964414936c710 (diff) | |
| download | libgit2-58c2b1c4218a2f90ee2745687f2e17670bde0b1b.tar.gz | |
UNBORN implies FAST_FORWARD
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/merge.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 491f831f8..21159d832 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -248,8 +248,8 @@ typedef enum { GIT_MERGE_ANALYSIS_NORMAL = (1 << 0), /** - * The repository is already up-to-date and no merge needs to be - * performed. The given merge input already exists as a parent of HEAD. + * All given merge inputs are reachable from HEAD, meaning the + * repository is up-to-date and no merge needs to be performed. */ GIT_MERGE_ANALYSIS_UP_TO_DATE = (1 << 1), |