{"thread":{"id":"19661","subject":"di-git-ally managing love letters - a Git presentation","startedAt":"2009-06-04T11:41:37Z","lastAt":"2009-06-06T08:29:40Z","messageCount":10,"participants":["Shakthi Kannan","Johannes Schindelin","Matthieu Moy","Magnus Bäck","Jakub Narebski","Sitaram Chamarty"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"115424","messageId":"d16b1c80906040441n7ad549eay83a6ccfd5db09fb3@mail.gmail.com","threadId":"19661","inReplyTo":null,"subject":"di-git-ally managing love letters - a Git presentation","fromName":"Shakthi Kannan","fromEmail":"shakthimaan@gmail.com","sentAt":"2009-06-04T11:41:37Z","receivedAt":"2009-06-04T11:41:37Z","isPatch":false,"sender":{"key":"shakthimaan@gmail.com","avatar":null},"body":"Hi,\n\nI have tried to make a basic presentation on Git, that covers some\nbasic commands. Please find it here:\nhttp://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf\n\nThe LaTeX beamer sources are available at:\nhttp://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.tar.bz2\n\nI start with git init, add, commit; show how to use rm with -f and\n--cached options; then go on to show reset HEAD (alternative to using\n--cached?); proceed further to show reset --soft and --hard options.\nFinally, branching, merging, rebase and clone. It is not meant to be a\ncomprehensive list of git commands, but, some essential ones to get\npeople started with (I hope).\n\nI would appreciate feedback, suggestions on the same. If you feel the\ncommands are to be used differently, or in a different workflow\nperhaps, or if you find something that needs to be added, removed or\nfixed, please let me know.\n\nKindly ignore the nouns used.\n\nThanks!\n\nSK\n\n-- \nShakthi Kannan\nhttp://www.shakthimaan.com\n"},{"id":"115425","messageId":"alpine.DEB.1.00.0906041350330.4912@intel-tinevez-2-302","threadId":"19661","inReplyTo":"d16b1c80906040441n7ad549eay83a6ccfd5db09fb3@mail.gmail.com","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-06-04T11:51:45Z","receivedAt":"2009-06-04T11:51:45Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 4 Jun 2009, Shakthi Kannan wrote:\n\n> I have tried to make a basic presentation on Git, that covers some\n> basic commands. Please find it here:\n> http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf\n\nFun!\n\nThe tilde in ~/.gitconfig gets on top of the slash, though...\n\nOh, and I would prefer to teach the people about \"git log\" rather than \n\"git gl\", but I guess that is my personal taste only.\n\nCiao,\nDscho\n"},{"id":"115428","messageId":"vpqmy8ogodf.fsf@bauges.imag.fr","threadId":"19661","inReplyTo":"alpine.DEB.1.00.0906041350330.4912@intel-tinevez-2-302","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2009-06-04T12:44:12Z","receivedAt":"2009-06-04T12:44:12Z","isPatch":false,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Oh, and I would prefer to teach the people about \"git log\" rather than \n> \"git gl\", but I guess that is my personal taste only.\n\nWell, there's what you want to teach, and what fits on a slide ;-).\ngit log would force either a long command-line, or a very verbose\noutput (which in turn implies very small font). So, I found the alias\nidea in the presentation to be good.\n\n-- \nMatthieu\n"},{"id":"115430","messageId":"20090604125653.GA26121@jeeves.jpl.local","threadId":"19661","inReplyTo":"alpine.DEB.1.00.0906041350330.4912@intel-tinevez-2-302","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Magnus Bäck","fromEmail":"baeck@swipnet.se","sentAt":"2009-06-04T12:56:53Z","receivedAt":"2009-06-04T12:56:53Z","isPatch":false,"sender":{"key":"baeck@swipnet.se","avatar":null},"body":"On Thursday, June 04, 2009 at 13:51 CEST,\n     Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n\n> On Thu, 4 Jun 2009, Shakthi Kannan wrote:\n> \n> > I have tried to make a basic presentation on Git, that covers some\n> > basic commands. Please find it here:\n> > http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf\n> \n> Fun!\n\nIndeed, I thought the visualization of what happens when you edit a\nfile, add it to the index etc was great.\n\n> The tilde in ~/.gitconfig gets on top of the slash, though...\n\n\\textasciitilde instead of \\~ should solve that problem.\n\n-- \nMagnus Bäck\nbaeck@swipnet.se\n"},{"id":"115432","messageId":"m3oct46oji.fsf@localhost.localdomain","threadId":"19661","inReplyTo":"d16b1c80906040441n7ad549eay83a6ccfd5db09fb3@mail.gmail.com","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2009-06-04T14:51:20Z","receivedAt":"2009-06-04T14:51:20Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Shakthi Kannan <shakthimaan@gmail.com> writes:\n\n> I have tried to make a basic presentation on Git, that covers some\n> basic commands. Please find it here:\n> http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf\n> \n> The LaTeX beamer sources are available at:\n> http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.tar.bz2\n\nWhy don't you use git to manage LaTeX sources, using for example one\nof free git hosting sites (repo.or.cz, GitHub, Gitorious)?\n\n\nI liked the presentation, especially visualisation of status of\nworking area, index and object database (repository).\n\nA few comments:\n * For which git version do you write your presentation?  Modern\n   git (which might mean just released version, and perhaps even\n   yet-to-be-released version) has:\n     - git config --global --edit   #; for Windows users\n     - git log --oneline == git log --pretty=oneline --abbrev-commit\n\n * Nitpick: git index (also known as staging area) does not contain\n   objects itself.  They are put in objects database.  The index \n   contains references to those objects (so they can be found).\n\n * Suggestion: When showing \"git diff\", \"git diff --cached\" and \n   \"git diff HEAD\" output you might want to show which parts\n   in the diagram below you compare.\n\n * Why there is no diagram / graph for tagging?\n\n * Nitpick: you have spelled 'git-format-patch' by mistake\n   instead of modern 'git format-patch'.\n\n>\n> I start with git init, add, commit;\n\n * I wonder which of workflows is more common: starting with empty\n   repository, or starting with some set of files.  You can do\n   \"git init\" in existing directory.  But perhaps starting with\n   clean state is easier to describe, as you can just \"git add .\",\n   while you might want to add only subset of files (using for\n   example ignore rules) in project import workflow.\n\n> show how to use rm with -f and --cached options; \n\n * I would personally use \"git rm -f <file>\", but it might be easier\n   tu add '-f' at the end of line.\n\n> then go on to show reset HEAD (alternative to using --cached?);\n\n * I would guess that this usage (\"git reset HEAD <file>\") is quite\n   rare, and would make more sense if there would be some committed\n   version of <file>; then it wouldn't be equivalent to \n   \"git rm --cached <file>\".\n\n> proceed further to show reset --soft\n\n * I think that actual usage of \"git reset --soft\" is pretty pretty\n   rare since we have \"git commit --amend\".\n\n> and --hard options.\n\n * \"git reset --hard <revision>\" is actually pretty useful.\n\n> Finally, branching, merging, rebase and clone. It is not meant to be a\n> comprehensive list of git commands, but, some essential ones to get\n> people started with (I hope).\n> \n> I would appreciate feedback, suggestions on the same. If you feel the\n> commands are to be used differently, or in a different workflow\n> perhaps, or if you find something that needs to be added, removed or\n> fixed, please let me know.\n> \n> Kindly ignore the nouns used.\n\nI don't know if presentation is not too long. On the other hand it\ndoesn't cover situations such as non fast-formard merge...\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"115471","messageId":"d16b1c80906042152r77006c77lceb90ec616836ba3@mail.gmail.com","threadId":"19661","inReplyTo":"m3oct46oji.fsf@localhost.localdomain","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Shakthi Kannan","fromEmail":"shakthimaan@gmail.com","sentAt":"2009-06-05T04:52:31Z","receivedAt":"2009-06-05T04:52:31Z","isPatch":false,"sender":{"key":"shakthimaan@gmail.com","avatar":null},"body":"Hi,\n\nFirstly, thanks for your reply! This is the feedback I was hoping to\nhear. My replies below:\n\n--- On Thu, Jun 4, 2009 at 8:21 PM, Jakub Narebski<jnareb@gmail.com> wrote:\n| Why don't you use git to manage LaTeX sources, using for example one\n| of free git hosting sites (repo.or.cz, GitHub, Gitorious)?\n\\--\n\nPractice what you preach :) Sure, could. Will look into it.\n\n---\n| A few comments:\n|  * For which git version do you write your presentation?\n\\--\n\nOn Fedora 10, git 1.6.0.6.\n\n---\n| Modern\n|   git (which might mean just released version, and perhaps even\n|   yet-to-be-released version) has:\n|     - git log --oneline == git log --pretty=oneline --abbrev-commit\n\\--\n\nWill remember that.\n\n---\n|  * Nitpick: git index (also known as staging area) does not contain\n|   objects itself.  They are put in objects database.  The index\n|   contains references to those objects (so they can be found).\n\\--\n\nI can mention it as \"object ref\" or \"object(s) ref\".\n\n---\n|  * Suggestion: When showing \"git diff\", \"git diff --cached\" and\n|   \"git diff HEAD\" output you might want to show which parts\n|   in the diagram below you compare.\n\\--\n\nWill do.\n\n---\n|  * Why there is no diagram / graph for tagging?\n\\--\n\nWill do. I guess it should be a tag symbol pointing to the recent commit?\n\n---\n|  * Nitpick: you have spelled 'git-format-patch' by mistake\n|   instead of modern 'git format-patch'.\n\\--\n\nOhh! In git 1.6.0.6, I had git-format-patch. I will keep up with the\nmodern git releases.\n\n---\n|  * I would personally use \"git rm -f <file>\", but it might be easier\n|   tu add '-f' at the end of line.\n\\--\n\nWill change it.\n\n---\n|  * I would guess that this usage (\"git reset HEAD <file>\") is quite\n|   rare,\n\\--\n\nI see. I just used it to show it because git printed it in the output,\nand someone new to using git should know as to what the output meant.\n\n---\n|  * I think that actual usage of \"git reset --soft\" is pretty pretty\n|   rare since we have \"git commit --amend\".\n\\--\n\nOhh! I just mentioned it to show the difference between --soft and --hard.\n\n---\n| I don't know if presentation is not too long. On the other hand it\n| doesn't cover situations such as non fast-formard merge...\n\\--\n\nYes. I don't yet have many use-cases, but, I guess it is a reasonable\nstart. Will work on these use cases.\n\nThanks again!\n\nSK\n\n-- \nShakthi Kannan\nhttp://www.shakthimaan.com\n"},{"id":"115472","messageId":"d16b1c80906042155s32dfb018i310724133eca687f@mail.gmail.com","threadId":"19661","inReplyTo":"vpqmy8ogodf.fsf@bauges.imag.fr","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Shakthi Kannan","fromEmail":"shakthimaan@gmail.com","sentAt":"2009-06-05T04:55:41Z","receivedAt":"2009-06-05T04:55:41Z","isPatch":false,"sender":{"key":"shakthimaan@gmail.com","avatar":null},"body":"Hi,\n\n--- On Thu, Jun 4, 2009 at 6:14 PM, Matthieu Moy<Matthieu.Moy@imag.fr> wrote:\n| Well, there's what you want to teach, and what fits on a slide ;-).\n| git log would force either a long command-line, or a very verbose\n| output (which in turn implies very small font).\n\\--\n\nThat is correct!\n\nI tried to squeeze as much of the commands and output along with the\ndiagrams onto a single slide. I didn't want to compromise on the font\nsize though.\n\nSK\n\n-- \nShakthi Kannan\nhttp://www.shakthimaan.com\n"},{"id":"115486","messageId":"slrnh2hffa.2tt.sitaramc@sitaramc.homelinux.net","threadId":"19661","inReplyTo":"d16b1c80906040441n7ad549eay83a6ccfd5db09fb3@mail.gmail.com","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Sitaram Chamarty","fromEmail":"sitaramc@gmail.com","sentAt":"2009-06-05T06:40:43Z","receivedAt":"2009-06-05T06:40:43Z","isPatch":false,"sender":{"key":"sitaramc@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43316?v=4"},"body":"On 2009-06-04 11:41:37, Shakthi Kannan <shakthimaan@gmail.com> wrote:\n> Hi,\n>\n> I have tried to make a basic presentation on Git, that covers some\n> basic commands. Please find it here:\n> http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf\n\nvery nice.\n\nSlide 188 is a little misleading.  The word \"master\" in the\ngreen oval at bottom right should actually read\n\"priyaanka-chopra\", because that is the branch you have\nchecked out.  \"master\" should still be pointing to 958d5.\nIn fact you're completely missing an oval for the\npriyaanka-chopra branch, I think.\n\nSitaram\n\n-- \n\n<offtopic>\n\n> Kindly ignore the nouns used.\n\nyeah right... you \"check[ed ]out\" and \"touch[ed]\" so many\nactresses, but you want *us* to ignore it ;-)\n\nPS: I assume mis-spelling every single actress's name was\nintentional...\n\n</offtopic>\n"},{"id":"115500","messageId":"d16b1c80906050445j12b985ecmbc0c51c9b81b9f4d@mail.gmail.com","threadId":"19661","inReplyTo":"slrnh2hffa.2tt.sitaramc@sitaramc.homelinux.net","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Shakthi Kannan","fromEmail":"shakthimaan@gmail.com","sentAt":"2009-06-05T11:45:01Z","receivedAt":"2009-06-05T11:45:01Z","isPatch":false,"sender":{"key":"shakthimaan@gmail.com","avatar":null},"body":"Hi!\n\n--- On Fri, Jun 5, 2009 at 12:10 PM, Sitaram Chamarty<sitaramc@gmail.com> wrote:\n| Slide 188 is a little misleading.  The word \"master\" in the\n| green oval at bottom right should actually read\n| \"priyaanka-chopra\", because that is the branch you have\n| checked out.  \"master\" should still be pointing to 958d5.\n| In fact you're completely missing an oval for the\n| priyaanka-chopra branch, I think.\n\\--\n\nThanks! Also in slide 210 - git rebase (3), where I commit in\n\"priyaaanka-chopra\" branch.\n\nI guess that is where the HEAD detaches from the master on the branch.\nThe next release will include this change.\n\n---\n| <offtopic>\n| yeah right... you \"check[ed ]out\" and \"touch[ed]\" so many\n| actresses, but you want *us* to ignore it ;-)\n\\--\n\nI didn't want to take the analogy too far.\n\n---\n| PS: I assume mis-spelling every single actress's name was\n| intentional...\n|\n| </offtopic>\n\\--\n\nFeel free to change the names to suit your needs :)\n\nSK\n\n-- \nShakthi Kannan\nhttp://www.shakthimaan.com\n"},{"id":"115612","messageId":"d16b1c80906060129te40d53eyea31b116d807cd8d@mail.gmail.com","threadId":"19661","inReplyTo":"d16b1c80906050445j12b985ecmbc0c51c9b81b9f4d@mail.gmail.com","subject":"Re: di-git-ally managing love letters - a Git presentation","fromName":"Shakthi Kannan","fromEmail":"shakthimaan@gmail.com","sentAt":"2009-06-06T08:29:40Z","receivedAt":"2009-06-06T08:29:40Z","isPatch":false,"sender":{"key":"shakthimaan@gmail.com","avatar":null},"body":"Hi!\n\nI have made the necessary changes. Hopefully we can add more use cases\nto it, as required. You can now clone the source repo from:\n  git clone git://gitorious.org/di-git-ally-managing-love-letters/mainline.git\n\nIf you just want the updated pdf, take it from:\nhttp://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf\n\nThanks for all your feedback! Appreciate it!\n\nSK\n\n-- \nShakthi Kannan\nhttp://www.shakthimaan.com\n"}]}