>I just a bit updated the git wiki [1], can you review it pls ? >- Answered some the FAQs >- Added Git configuration info >- Added the case where time has elapsed between the merge and the push + some >more details.
Hi guys, A couple of things. I might have missed the reason why, but it seems like there is a perforce tool coded into the sample gitconfig. Reason? Regarding the working on code section. I think I see where some of the confusion comes from on the rebase thing. If, when you wanted to work on code, people just did either a pull (or a fetch + merge) on develop into their develop branch first. Then made their branch, they could skip that rebase step, which IMO is a positive thing especially when you are starting out... Regarding Step 2. So, this is sounding a little SVNish. Its not wrong by any means, but usually when people work with git, they are checking in a lot. So, I basically do it anytime I make any viable change.. so, step 2 and 3 repeat a lot for me. Regarding step 4, and I am sorry I didn't follow this earlier, is there a reason we are so concerned with rebasing right now? On Step 5, any particular reason we are using non-fast forward? Step 8 is optional if you wish, but I usually keep my branches around so I can visit changes again in the future in isolation. I will review the FAQ in another hour or so. Mike
