Long list of conflicts hide the help about fac

[mkchoi212]

For now, the help text is not displayed until the user types ? or h.

But you are right about the shortcuts being hidden with a long list of conflicts. To solve this, I was thinking about dedicating a separate panel that would go on top of the conflict list panel.

I thought about listing all the commands on the prompt but as an avid git add -p user, I never look at all the options and have never found them to be useful.

[hkdobrev]

I thought about listing all the commands on the prompt but as an avid git add -p user, I never look at all the options and have never found them to be useful.

It's the same for me until you show it to someone else who sees it for the first time or use it in a pairing session where you use a letter which the others don't know about. IMHO it's always useful to list them on the command prompt with a question mark for more info.

[mkchoi212]

For now, I've placed just a ? at the end of prompt to inform people of the command. See 5841577

[alok]

@mkchoi212 Do you actually use the git add -p prompt? I've always found it hideous and use tig's much nicer interface or occasionally (vi)magit.

[mkchoi212]

@alok Yes. I've never used tig though. I will check that out.