]> git.ipfire.org Git - thirdparty/git.git/commit - branch.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 89d1b57 f3f8311)
Merge branch 'nd/merge-quit'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2019 20:19:41 +0000 (13:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2019 20:19:41 +0000 (13:19 -0700)
commitc4a38d161cbd3308825d7871d0f84f769aad04ab
tree7c2ea40857b1242030eff1a3cc4548941a152deftree | snapshot
parent89d1b573d73e7c93f2190a08ed9430f42104c10bcommit | diff
parentf3f8311ec76f9bcdc7e26a125e585eb4e473a8d2commit | diff
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()
Documentation/git-merge.txt diff1 | diff2 | blob | history
branch.c diff1 | diff2 | blob | history
branch.h diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
t/t7600-merge.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.