On Sat, Sep 3, 2011 at 6:38 PM, Jakub Narebski <jnareb@xxxxxxxxx> wrote: > On Sat, 3 Sep 2011, Felipe Contreras wrote: >> 2011/7/25 Jakub Narebski <jnareb@xxxxxxxxx>: > >> > I am planning doing annual Git User's Survey, and I'd like to ask for >> > feedback. >> >> Do you have an updated version somewhere? > > You can preview test version of survey at > > https://www.survs.com/survey/VEBXFGJ9B0 > > Note that all answers in this test channel will be deleted! > > Up to date version was sent to git mailing list as > > [RFCv2] Questions for "Git User's Survey 2011" > http://article.gmane.org/gmane.comp.version-control.git/180643 > > and can be found on Git Wiki: > > http://git.wiki.kernel.org/index.php/GitSurvey2011 > > > P.S. If I remember correctly you wanted some question about "staging area" > terminology, or something like that. Do you have concrete proposal for > question and list of answers? > > I was thinking about > > xx. How do you include changes in new commit? > (multiple choice, with other) > > [ ] commit -a > [ ] commit <file> > [ ] commit -i <file> > [ ] git add > [ ] git stage > [ ] git update-index > [ ] incremental add / commit > [ ] other, please specify __________________________ > > (it is not in current version of survey, but can be added before it starts > for real)... though it is only small subset of "stage" vs "the index" > terminology. If you have something better... I am just looking at this. You should send regular updates to the survey, right after the initial batch of feedback, not one day before. First of all, "changes in new commit" doesn't sound right, should be either "a new commit", or "new commits". Second, you should have added what I said: + stage / partial or interactive commits (e.g. git add -u/-i/-p, git diff --cached) Nowhere in the survey does it as for 'git diff --cached' or anything that acts on the stage. So now we have your question, plus this: + interactive commit / per-hunk comitting / partial commit But that's not good enough. People might think 'git add -u/-i/-p' is not related to a commit. Also, we still don't know if people use --cached --keep-index, or any of those. If instead of 'git add/stage' you had 'git add/stage -u/-i/-p' That would have been better, and no, incremental add /commit doesn't really fit, for example, I usually do 'git add -p; git commit', so it's not really incremental. I think we should stop beating around the bushes, and ask what we want to ask: == Do you use the stage/cache/index? == If you don't want to ask that question directly, or you think people might not understand the question, we should be listing all the commands that use the stage, and make sure they are handled in the survey: X git diff --cached X git grep --cached X git rm --cached X git stash apply/pop --index X git stash (save) --[no-]keep-index X git add <tracked_file> X git add -p X git add -i X git add -u X git commit -p X git commit --interactive (not the same as git commit -i) It turns out none of them are explicitly asked in the survey. In order to do that, this is the only option I see: + interactive commits (e.g. git commit -p/--interactive) + stage (e.g. git add -p/-i/-u, git add <tracked_file)) + stage commands (e.g. git * --cached, git stash * --index/--[no-]keep-index) Or at the very least what I suggested initially: + stage / partial or interactive commits (e.g. git add -u/-i/-p, git * --cached) Cheers. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html