Git: more newbie questions

[ninetydegrees]

1) If you're working on bug A on branch A then want to work on completely unrelated bug B on branch B, do you need to stash you changes on A checkout develop then create branch B?

Answer: yes, but see comments about using git commit and git commit --amend in your workflow.

2) When can you use git diff? Before add only? Because otherwise it gives me nothing and I have to use git status -v.

Answer: possibly with git diff --cached or git diff HEAD^ HEAD (untested)

3) Oh I feel so stupid for asking this but how do you get out of git diff or git log on PuTTY? Ctrl+C and Ctrl+X don't work.

Answer: the magic key is 'q' and this is related to PAGER and not PuTTY

4) If you're working on bug A on branch A and have reached a point where you want to do some more work but be easily able to revert to where you were before, what is the best route? Several commits? Creating a subbranch A1 (is that possible?)? Is that where merge is useful? I'm having the hardest time understanding how merge can be used concretely.

Answer: several commits is indeed the best route; the concept of 'subbranches' isn't valid.

5) In git config, is there a way to reset the value of core.editor to whatever is the default on your computer (without naming the editor)?

Answer: yes, with git config --global --unset core.editor

The next part of 4242 is a little more complicated.

[randomling]

So the new comment preview page, which shows who you are posting the comment as, is working on my 'hack. Yay! That actually fulfills the bug, but there's something else I want to do as part of it for extra functionality, because it occurs to me that you can now see who you're commenting as, but you don't have an easy way to go back and change it apart from the back button.

So, I want to add a More Options button.

Obviously, adding the actual button is Not Very Hard. What is hard is getting this button to actually take you to the reply page - that's mode=reply for top-level comments, or replyto=$commentid for comment replies.

I've been trying to go through various pages (Talk.pm, talkpost_do.bml, talkread.bml) to find out how the regular comments page does it, so I can try to replicate that. But I'm having another "forest of code" problem and I can't trace the code path from the more options button to loading the next page...

Could anyone help me figure out what's going on here so I can reproduce it?

Thanks!