diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:55 +0900 |
| commit | 0293121717ba66f089a38ce4d4d895db0f946e49 (patch) | |
| tree | 2f9691ca131a570751e48f77b6a34c23352c352a /commit.h | |
| parent | Merge branch 'pk/rebase-in-c-3-acts' (diff) | |
| parent | builtin rebase: support --root (diff) | |
| download | tgif-0293121717ba66f089a38ce4d4d895db0f946e49.tar.xz | |
Merge branch 'pk/rebase-in-c-4-opts'
Rewrite "git rebase" in C.
* pk/rebase-in-c-4-opts:
builtin rebase: support --root
builtin rebase: add support for custom merge strategies
builtin rebase: support `fork-point` option
merge-base --fork-point: extract libified function
builtin rebase: support --rebase-merges[=[no-]rebase-cousins]
builtin rebase: support `--allow-empty-message` option
builtin rebase: support `--exec`
builtin rebase: support `--autostash` option
builtin rebase: support `-C` and `--whitespace=<type>`
builtin rebase: support `--gpg-sign` option
builtin rebase: support `--autosquash`
builtin rebase: support `keep-empty` option
builtin rebase: support `ignore-date` option
builtin rebase: support `ignore-whitespace` option
builtin rebase: support --committer-date-is-author-date
builtin rebase: support --rerere-autoupdate
builtin rebase: support --signoff
builtin rebase: allow selecting the rebase "backend"
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -205,6 +205,8 @@ int register_commit_graft(struct repository *r, struct commit_graft *, int); void prepare_commit_graft(struct repository *r); struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid); +struct commit *get_fork_point(const char *refname, struct commit *commit); + /* largest positive number a signed 32-bit integer can contain */ #define INFINITE_DEPTH 0x7fffffff |