mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/merge-quit'

Browse Source 
"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()
This commit is contained in:
Junio C Hamano
2019-06-13 13:19:41 -07:00
parent 89d1b573d7 f3f8311ec7
commit c4a38d161c
5 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
branch.h
View File

@ -60,6 +60,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)