Thread (1 message) 1 message, 1 author, 2016-06-15

Re: git add -p and unresolved conflicts

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:25

Matthieu Moy [off-list ref] writes:
The "'git reset $path' before 'add -p'" workaround is not really handy
there: it requires typing the path,...
That is exactly why "add -i" was written without first giving "add -p"
shorthand, which spoiled you and at the same time robbed you the other
parts of "add -i".
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help