diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:41 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:41 (GMT) |
commit | c4a38d161cbd3308825d7871d0f84f769aad04ab (patch) | |
tree | 7c2ea40857b1242030eff1a3cc4548941a152def /branch.h | |
parent | 89d1b573d73e7c93f2190a08ed9430f42104c10b (diff) | |
parent | f3f8311ec76f9bcdc7e26a125e585eb4e473a8d2 (diff) | |
download | git-c4a38d161cbd3308825d7871d0f84f769aad04ab.zip git-c4a38d161cbd3308825d7871d0f84f769aad04ab.tar.gz git-c4a38d161cbd3308825d7871d0f84f769aad04ab.tar.bz2 |
Merge branch 'nd/merge-quit'
"git merge" learned "--quit" option that cleans up the in-progress
merge while leaving the working tree and the index still in a mess.
* nd/merge-quit:
merge: add --quit
merge: remove drop_save() in favor of remove_merge_branch_state()
Diffstat (limited to 'branch.h')
-rw-r--r-- | branch.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -61,6 +61,12 @@ int validate_branchname(const char *name, struct strbuf *ref); int validate_new_branchname(const char *name, struct strbuf *ref, int force); /* + * Remove information about the merge state on the current + * branch. (E.g., MERGE_HEAD) + */ +void remove_merge_branch_state(struct repository *r); + +/* * Remove information about the state of working on the current * branch. (E.g., MERGE_HEAD) */ |