proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-19 20:36:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase: correct documentation, CHANGELOG

Browse Source
This commit is contained in:
Edward Thomson 2015-04-20 17:22:39 -04:00
parent 94c988f6d6
commit aa9bb425a9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -28,7 +28,7 @@ v0.22 + 1
allow for specifying the expression from the user to be put into the allow for specifying the expression from the user to be put into the
reflog. reflog.
* `git_rebase_commit` now return `GIT_EUNMERGED` when you attempt to * `git_rebase_commit` now returns `GIT_EUNMERGED` when you attempt to
commit with unstaged changes. commit with unstaged changes.
### API additions ### API additions

16
include/git2/rebase.h
View File

@ -33,18 +33,18 @@ typedef struct {
* Used by `git_rebase_init`, this will instruct other clients working * Used by `git_rebase_init`, this will instruct other clients working
* on this rebase that you want a quiet rebase experience, which they * on this rebase that you want a quiet rebase experience, which they
* may choose to provide in an application-specific manner. This has no * may choose to provide in an application-specific manner. This has no
* effect upon libgit2 directly, but is provided for interoperability with * effect upon libgit2 directly, but is provided for interoperability
* other clients. * between Git tools.
*/ */
int quiet; int quiet;
/** /**
* Used by `git_rebase_finish`, this is the canonical name of the notes * Used by `git_rebase_finish`, this is the name of the notes reference
* reference used to rewrite notes for rebased commits when finishing the * used to rewrite notes for rebased commits when finishing the rebase;
* rebase; if NULL, the contents of the coniguration option * if NULL, the contents of the coniguration option `notes.rewriteRef`
* `notes.rewriteRef` is examined, unless the configuration option * is examined, unless the configuration option `notes.rewrite.rebase`
* `notes.rewrite.rebase` is set to false. If `notes.rewriteRef` is also * is set to false. If `notes.rewriteRef` is also NULL, notes will
* NULL, notes will not be rewritten. * not be rewritten.
*/ */
const char *rewrite_notes_ref; const char *rewrite_notes_ref;