di-git-ally managing love letters - a Git presentation

di-git-ally managing love letters - a Git presentation

[Shakthi Kannan]

Hi,

I have tried to make a basic presentation on Git, that covers some
basic commands. Please find it here:
http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf

The LaTeX beamer sources are available at:
http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.tar.bz2

I start with git init, add, commit; show how to use rm with -f and
--cached options; then go on to show reset HEAD (alternative to using
--cached?); proceed further to show reset --soft and --hard options.
Finally, branching, merging, rebase and clone. It is not meant to be a
comprehensive list of git commands, but, some essential ones to get
people started with (I hope).

I would appreciate feedback, suggestions on the same. If you feel the
commands are to be used differently, or in a different workflow
perhaps, or if you find something that needs to be added, removed or
fixed, please let me know.

Kindly ignore the nouns used.

Thanks!

SK

-- 
Shakthi Kannan
http://www.shakthimaan.com

Re: di-git-ally managing love letters - a Git presentation

[Johannes Schindelin]

Hi,

On Thu, 4 Jun 2009, Shakthi Kannan wrote:

> I have tried to make a basic presentation on Git, that covers some
> basic commands. Please find it here:
> http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf

Fun!

The tilde in ~/.gitconfig gets on top of the slash, though...

Oh, and I would prefer to teach the people about "git log" rather than 
"git gl", but I guess that is my personal taste only.

Ciao,
Dscho

Re: di-git-ally managing love letters - a Git presentation

[Matthieu Moy]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Oh, and I would prefer to teach the people about "git log" rather than 
> "git gl", but I guess that is my personal taste only.

Well, there's what you want to teach, and what fits on a slide ;-).
git log would force either a long command-line, or a very verbose
output (which in turn implies very small font). So, I found the alias
idea in the presentation to be good.

-- 
Matthieu

Re: di-git-ally managing love letters - a Git presentation

[Shakthi Kannan]

Hi,

--- On Thu, Jun 4, 2009 at 6:14 PM, Matthieu Moy<Matthieu.Moy@imag.fr> wrote:
| Well, there's what you want to teach, and what fits on a slide ;-).
| git log would force either a long command-line, or a very verbose
| output (which in turn implies very small font).
\--

That is correct!

I tried to squeeze as much of the commands and output along with the
diagrams onto a single slide. I didn't want to compromise on the font
size though.

SK

-- 
Shakthi Kannan
http://www.shakthimaan.com

Re: di-git-ally managing love letters - a Git presentation

[Magnus Bäck]

On Thursday, June 04, 2009 at 13:51 CEST,
     Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

> On Thu, 4 Jun 2009, Shakthi Kannan wrote:
> 
> > I have tried to make a basic presentation on Git, that covers some
> > basic commands. Please find it here:
> > http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf
> 
> Fun!

Indeed, I thought the visualization of what happens when you edit a
file, add it to the index etc was great.

> The tilde in ~/.gitconfig gets on top of the slash, though...

\textasciitilde instead of \~ should solve that problem.

-- 
Magnus Bäck
baeck@swipnet.se

Re: di-git-ally managing love letters - a Git presentation

[Jakub Narebski]

Shakthi Kannan <shakthimaan@gmail.com> writes:

> I have tried to make a basic presentation on Git, that covers some
> basic commands. Please find it here:
> http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf
> 
> The LaTeX beamer sources are available at:
> http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.tar.bz2

Why don't you use git to manage LaTeX sources, using for example one
of free git hosting sites (repo.or.cz, GitHub, Gitorious)?


I liked the presentation, especially visualisation of status of
working area, index and object database (repository).

A few comments:
 * For which git version do you write your presentation?  Modern
   git (which might mean just released version, and perhaps even
   yet-to-be-released version) has:
     - git config --global --edit   #; for Windows users
     - git log --oneline == git log --pretty=oneline --abbrev-commit

 * Nitpick: git index (also known as staging area) does not contain
   objects itself.  They are put in objects database.  The index 
   contains references to those objects (so they can be found).

 * Suggestion: When showing "git diff", "git diff --cached" and 
   "git diff HEAD" output you might want to show which parts
   in the diagram below you compare.

 * Why there is no diagram / graph for tagging?

 * Nitpick: you have spelled 'git-format-patch' by mistake
   instead of modern 'git format-patch'.

>
> I start with git init, add, commit;

 * I wonder which of workflows is more common: starting with empty
   repository, or starting with some set of files.  You can do
   "git init" in existing directory.  But perhaps starting with
   clean state is easier to describe, as you can just "git add .",
   while you might want to add only subset of files (using for
   example ignore rules) in project import workflow.

> show how to use rm with -f and --cached options; 

 * I would personally use "git rm -f <file>", but it might be easier
   tu add '-f' at the end of line.

> then go on to show reset HEAD (alternative to using --cached?);

 * I would guess that this usage ("git reset HEAD <file>") is quite
   rare, and would make more sense if there would be some committed
   version of <file>; then it wouldn't be equivalent to 
   "git rm --cached <file>".

> proceed further to show reset --soft

 * I think that actual usage of "git reset --soft" is pretty pretty
   rare since we have "git commit --amend".

> and --hard options.

 * "git reset --hard <revision>" is actually pretty useful.

> Finally, branching, merging, rebase and clone. It is not meant to be a
> comprehensive list of git commands, but, some essential ones to get
> people started with (I hope).
> 
> I would appreciate feedback, suggestions on the same. If you feel the
> commands are to be used differently, or in a different workflow
> perhaps, or if you find something that needs to be added, removed or
> fixed, please let me know.
> 
> Kindly ignore the nouns used.

I don't know if presentation is not too long. On the other hand it
doesn't cover situations such as non fast-formard merge...

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: di-git-ally managing love letters - a Git presentation

[Shakthi Kannan]

Hi,

Firstly, thanks for your reply! This is the feedback I was hoping to
hear. My replies below:

--- On Thu, Jun 4, 2009 at 8:21 PM, Jakub Narebski<jnareb@gmail.com> wrote:
| Why don't you use git to manage LaTeX sources, using for example one
| of free git hosting sites (repo.or.cz, GitHub, Gitorious)?
\--

Practice what you preach :) Sure, could. Will look into it.

---
| A few comments:
|  * For which git version do you write your presentation?
\--

On Fedora 10, git 1.6.0.6.

---
| Modern
|   git (which might mean just released version, and perhaps even
|   yet-to-be-released version) has:
|     - git log --oneline == git log --pretty=oneline --abbrev-commit
\--

Will remember that.

---
|  * Nitpick: git index (also known as staging area) does not contain
|   objects itself.  They are put in objects database.  The index
|   contains references to those objects (so they can be found).
\--

I can mention it as "object ref" or "object(s) ref".

---
|  * Suggestion: When showing "git diff", "git diff --cached" and
|   "git diff HEAD" output you might want to show which parts
|   in the diagram below you compare.
\--

Will do.

---
|  * Why there is no diagram / graph for tagging?
\--

Will do. I guess it should be a tag symbol pointing to the recent commit?

---
|  * Nitpick: you have spelled 'git-format-patch' by mistake
|   instead of modern 'git format-patch'.
\--

Ohh! In git 1.6.0.6, I had git-format-patch. I will keep up with the
modern git releases.

---
|  * I would personally use "git rm -f <file>", but it might be easier
|   tu add '-f' at the end of line.
\--

Will change it.

---
|  * I would guess that this usage ("git reset HEAD <file>") is quite
|   rare,
\--

I see. I just used it to show it because git printed it in the output,
and someone new to using git should know as to what the output meant.

---
|  * I think that actual usage of "git reset --soft" is pretty pretty
|   rare since we have "git commit --amend".
\--

Ohh! I just mentioned it to show the difference between --soft and --hard.

---
| I don't know if presentation is not too long. On the other hand it
| doesn't cover situations such as non fast-formard merge...
\--

Yes. I don't yet have many use-cases, but, I guess it is a reasonable
start. Will work on these use cases.

Thanks again!

SK

-- 
Shakthi Kannan
http://www.shakthimaan.com

Re: di-git-ally managing love letters - a Git presentation

[Sitaram Chamarty]

On 2009-06-04 11:41:37, Shakthi Kannan <shakthimaan@gmail.com> wrote:
> Hi,
>
> I have tried to make a basic presentation on Git, that covers some
> basic commands. Please find it here:
> http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf

very nice.

Slide 188 is a little misleading.  The word "master" in the
green oval at bottom right should actually read
"priyaanka-chopra", because that is the branch you have
checked out.  "master" should still be pointing to 958d5.
In fact you're completely missing an oval for the
priyaanka-chopra branch, I think.

Sitaram

-- 

<offtopic>

> Kindly ignore the nouns used.

yeah right... you "check[ed ]out" and "touch[ed]" so many
actresses, but you want *us* to ignore it ;-)

PS: I assume mis-spelling every single actress's name was
intentional...

</offtopic>

Re: di-git-ally managing love letters - a Git presentation

[Shakthi Kannan]

Hi!

--- On Fri, Jun 5, 2009 at 12:10 PM, Sitaram Chamarty<sitaramc@gmail.com> wrote:
| Slide 188 is a little misleading.  The word "master" in the
| green oval at bottom right should actually read
| "priyaanka-chopra", because that is the branch you have
| checked out.  "master" should still be pointing to 958d5.
| In fact you're completely missing an oval for the
| priyaanka-chopra branch, I think.
\--

Thanks! Also in slide 210 - git rebase (3), where I commit in
"priyaaanka-chopra" branch.

I guess that is where the HEAD detaches from the master on the branch.
The next release will include this change.

---
| <offtopic>
| yeah right... you "check[ed ]out" and "touch[ed]" so many
| actresses, but you want *us* to ignore it ;-)
\--

I didn't want to take the analogy too far.

---
| PS: I assume mis-spelling every single actress's name was
| intentional...
|
| </offtopic>
\--

Feel free to change the names to suit your needs :)

SK

-- 
Shakthi Kannan
http://www.shakthimaan.com

Re: di-git-ally managing love letters - a Git presentation

[Shakthi Kannan]

Hi!

I have made the necessary changes. Hopefully we can add more use cases
to it, as required. You can now clone the source repo from:
  git clone git://gitorious.org/di-git-ally-managing-love-letters/mainline.git

If you just want the updated pdf, take it from:
http://shakthimaan.com/downloads/glv/presentations/di-git-ally-managing-love-letters.pdf

Thanks for all your feedback! Appreciate it!

SK

-- 
Shakthi Kannan
http://www.shakthimaan.com