diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:41 -0700 |
| commit | c4a38d161cbd3308825d7871d0f84f769aad04ab (patch) | |
| tree | 7c2ea40857b1242030eff1a3cc4548941a152def /commit.c | |
| parent | Merge branch 'ab/fail-prereqs-in-test' (diff) | |
| parent | merge: add --quit (diff) | |
| download | git-c4a38d161cbd3308825d7871d0f84f769aad04ab.tar.gz git-c4a38d161cbd3308825d7871d0f84f769aad04ab.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions