Thread (5 messages) flat view 5 messages, 3 authors, 2016-06-15

how to do "git merge --abort"

From: bill lam <hidden>
Date: 2016-06-15 22:47:17

How to abort a merge if it said there are conflicts but I do not want
to (or can not) resolve it for the moment.  I can not find the --abort
option as that for git-rebase.

-- 
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help