* Re: Many gits are offline this week
2007-10-05 1:27 ` Randal L. Schwartz
@ 2007-10-05 1:36 ` Johannes Schindelin
2007-10-05 1:43 ` Shawn O. Pearce
` (3 subsequent siblings)
4 siblings, 0 replies; 22+ messages in thread
From: Johannes Schindelin @ 2007-10-05 1:36 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: Shawn O. Pearce, git
Hi,
On Thu, 4 Oct 2007, Randal L. Schwartz wrote:
> >>>>> "Shawn" == Shawn O Pearce <spearce@spearce.org> writes:
>
> Shawn> Dscho and I will be (at least mostly) offline for the next four
> Shawn> days as we travel to San Jose for the 2007 Google Summer of Code
> Shawn> Mentor Summit.
>
> Oddly enough, I'm giving my "Intro to Git" talk at Google HQ on
> 12 october. Too bad you're just going to miss that. :)
We will not. I'll watch the YouTube video a hundred times.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 1:27 ` Randal L. Schwartz
2007-10-05 1:36 ` Johannes Schindelin
@ 2007-10-05 1:43 ` Shawn O. Pearce
2007-10-05 1:59 ` alan
` (2 subsequent siblings)
4 siblings, 0 replies; 22+ messages in thread
From: Shawn O. Pearce @ 2007-10-05 1:43 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: git
"Randal L. Schwartz" <merlyn@stonehenge.com> wrote:
> >>>>> "Shawn" == Shawn O Pearce <spearce@spearce.org> writes:
>
> Shawn> Dscho and I will be (at least mostly) offline for the next four
> Shawn> days as we travel to San Jose for the 2007 Google Summer of Code
> Shawn> Mentor Summit.
>
> Oddly enough, I'm giving my "Intro to Git" talk at Google HQ on
> 12 october. Too bad you're just going to miss that. :)
Yea, seeing as how I've never had the chance to see you give a
talk I am quite disappointed by the poor timing. I'll just have
to catch the talk on Google Video. And shout questions at my wall
to see if you can answer them.
--
Shawn.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 1:27 ` Randal L. Schwartz
2007-10-05 1:36 ` Johannes Schindelin
2007-10-05 1:43 ` Shawn O. Pearce
@ 2007-10-05 1:59 ` alan
2007-10-05 9:14 ` Paolo Ciarrocchi
2007-10-28 10:07 ` Mike Hommey
4 siblings, 0 replies; 22+ messages in thread
From: alan @ 2007-10-05 1:59 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: Shawn O. Pearce, git
On Thu, 4 Oct 2007, Randal L. Schwartz wrote:
>>>>>> "Shawn" == Shawn O Pearce <spearce@spearce.org> writes:
>
> Shawn> Dscho and I will be (at least mostly) offline for the next four
> Shawn> days as we travel to San Jose for the 2007 Google Summer of Code
> Shawn> Mentor Summit.
>
> Oddly enough, I'm giving my "Intro to Git" talk at Google HQ on
> 12 october. Too bad you're just going to miss that. :)
Are you going to have the same heckler as the Advanced Topics meeting? ]:>
--
Never trust a queue structure designed by a cryptographer.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 1:27 ` Randal L. Schwartz
` (2 preceding siblings ...)
2007-10-05 1:59 ` alan
@ 2007-10-05 9:14 ` Paolo Ciarrocchi
2007-10-05 13:12 ` Randal L. Schwartz
2007-10-28 10:07 ` Mike Hommey
4 siblings, 1 reply; 22+ messages in thread
From: Paolo Ciarrocchi @ 2007-10-05 9:14 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: Shawn O. Pearce, git
On 10/5/07, Randal L. Schwartz <merlyn@stonehenge.com> wrote:
> >>>>> "Shawn" == Shawn O Pearce <spearce@spearce.org> writes:
>
> Shawn> Dscho and I will be (at least mostly) offline for the next four
> Shawn> days as we travel to San Jose for the 2007 Google Summer of Code
> Shawn> Mentor Summit.
>
> Oddly enough, I'm giving my "Intro to Git" talk at Google HQ on
> 12 october. Too bad you're just going to miss that. :)
Hi Randal,
is there any material (slides, docs) you can share before the talks?
Thanks!
Regards,
--
Paolo
http://paolo.ciarrocchi.googlepages.com/
http://ubuntista.blogspot.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 9:14 ` Paolo Ciarrocchi
@ 2007-10-05 13:12 ` Randal L. Schwartz
2007-10-05 14:41 ` Dmitry Potapov
2007-10-07 17:01 ` Shawn O. Pearce
0 siblings, 2 replies; 22+ messages in thread
From: Randal L. Schwartz @ 2007-10-05 13:12 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: Shawn O. Pearce, git
>>>>> "Paolo" == Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> writes:
Paolo> is there any material (slides, docs) you can share before the talks?
I've had the slides reviewed by Smarter People Than Me on #git already, so
hopefully most of it is accurate. :) They're temporarily at
http://www.stonehenge.com/pic/Git-2.0.3-to-be.pdf
I still hope to have a few hours to go in and add a few sadly missing
graphics, particularly on the rebase vs merge section.
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 13:12 ` Randal L. Schwartz
@ 2007-10-05 14:41 ` Dmitry Potapov
2007-10-05 16:20 ` David Brown
2007-10-07 17:01 ` Shawn O. Pearce
1 sibling, 1 reply; 22+ messages in thread
From: Dmitry Potapov @ 2007-10-05 14:41 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: git
Hi Randal,
> I've had the slides reviewed by Smarter People Than Me on #git already, so
> hopefully most of it is accurate. :) They're temporarily at
>
> http://www.stonehenge.com/pic/Git-2.0.3-to-be.pdf
I believe I have found one mistake in your slides. Slide 18 reads:
"git-commit -a" is like "git-add .; git-commit"
But it is incorrect, because "git-commit -a" does not add new files, so
it works like "git-add -u .; git-commit".
Dmitry
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 14:41 ` Dmitry Potapov
@ 2007-10-05 16:20 ` David Brown
2007-10-05 17:19 ` Dmitry Potapov
0 siblings, 1 reply; 22+ messages in thread
From: David Brown @ 2007-10-05 16:20 UTC (permalink / raw)
To: Dmitry Potapov; +Cc: Randal L. Schwartz, git
On Fri, Oct 05, 2007 at 06:41:43PM +0400, Dmitry Potapov wrote:
>I believe I have found one mistake in your slides. Slide 18 reads:
>"git-commit -a" is like "git-add .; git-commit"
>
>But it is incorrect, because "git-commit -a" does not add new files, so
>it works like "git-add -u .; git-commit".
"git-commit -a" also detects files that have been deleted, whereas
"git-add" does not. In fact, I haven't found an easy way to detect this
other than "git-commit -a", and it is the only reason I ever run
"git-commit -a"
Dave
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 16:20 ` David Brown
@ 2007-10-05 17:19 ` Dmitry Potapov
2007-10-05 18:33 ` Jeff King
0 siblings, 1 reply; 22+ messages in thread
From: Dmitry Potapov @ 2007-10-05 17:19 UTC (permalink / raw)
To: Dmitry Potapov, Randal L. Schwartz, git
> >I believe I have found one mistake in your slides. Slide 18 reads:
> >"git-commit -a" is like "git-add .; git-commit"
> >
> >But it is incorrect, because "git-commit -a" does not add new files, so
> >it works like "git-add -u .; git-commit".
>
> "git-commit -a" also detects files that have been deleted, whereas
> "git-add" does not.
I just tried "git-add -u ." and it *does* detect deleted files.
$ git-status
# On branch master
nothing to commit (working directory clean)
$ rm oldfile
$ git-status
# On branch master
# Changed but not updated:
# (use "git add/rm <file>..." to update what will be committed)
#
# deleted: oldfile
#
no changes added to commit (use "git add" and/or "git commit -a")
$ git-add -u .
$ git-status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# deleted: oldfile
#
$ git-commit
Created commit 17e2bba: delete
1 files changed, 0 insertions(+), 1 deletions(-)
delete mode 100644 oldfile
So, it works exactly as "git-commit -a" in this case.
Dmitry
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 13:12 ` Randal L. Schwartz
2007-10-05 14:41 ` Dmitry Potapov
@ 2007-10-07 17:01 ` Shawn O. Pearce
2007-10-07 19:04 ` Daniel Barkalow
2007-10-07 19:37 ` Randal L. Schwartz
1 sibling, 2 replies; 22+ messages in thread
From: Shawn O. Pearce @ 2007-10-07 17:01 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: Paolo Ciarrocchi, git
"Randal L. Schwartz" <merlyn@stonehenge.com> wrote:
> >>>>> "Paolo" == Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> writes:
>
> Paolo> is there any material (slides, docs) you can share before the talks?
>
> I've had the slides reviewed by Smarter People Than Me on #git already, so
> hopefully most of it is accurate. :) They're temporarily at
>
> http://www.stonehenge.com/pic/Git-2.0.3-to-be.pdf
>
> I still hope to have a few hours to go in and add a few sadly missing
> graphics, particularly on the rebase vs merge section.
What, no mention of git-gui as a porcelain? It has more users
than qgit according to the survey. Maybe rephrase the porcelains
on slide 15 as:
Other porcelain exists:
- StGit ("stacked git"), guilt
- tig (curses-based viewer)
- qgit, git-gui
On slide 26 you say "gitk mytopic origin" shows the changes back to
the common ancestor. That's what "gitk mytopic...origin" would do.
Note the three dots instead of the space. The space will cause
gitk to show all history back to the beginning of time.
On slide 27 you say that you can rebase your changes on upstream
using "git-rebase origin/master master". That's a lot more
typing than is required, most people will want to rebase their
current branch onto the upstream and thus will use "git-rebase
origin/master". Personally I think combining git-checkout's branch
switch feature into git-rebase is stupid. It really makes things
confusing. But its supported. :-(
--
Shawn.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-07 17:01 ` Shawn O. Pearce
@ 2007-10-07 19:04 ` Daniel Barkalow
2007-10-07 22:31 ` Johannes Schindelin
2007-10-07 19:37 ` Randal L. Schwartz
1 sibling, 1 reply; 22+ messages in thread
From: Daniel Barkalow @ 2007-10-07 19:04 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Randal L. Schwartz, Paolo Ciarrocchi, git
On Sun, 7 Oct 2007, Shawn O. Pearce wrote:
> "Randal L. Schwartz" <merlyn@stonehenge.com> wrote:
> > >>>>> "Paolo" == Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> writes:
> >
> > Paolo> is there any material (slides, docs) you can share before the talks?
> >
> > I've had the slides reviewed by Smarter People Than Me on #git already, so
> > hopefully most of it is accurate. :) They're temporarily at
> >
> > http://www.stonehenge.com/pic/Git-2.0.3-to-be.pdf
> >
> > I still hope to have a few hours to go in and add a few sadly missing
> > graphics, particularly on the rebase vs merge section.
>
> What, no mention of git-gui as a porcelain? It has more users
> than qgit according to the survey. Maybe rephrase the porcelains
> on slide 15 as:
>
> Other porcelain exists:
> - StGit ("stacked git"), guilt
> - tig (curses-based viewer)
> - qgit, git-gui
For that matter, gitweb is essentially a limited porcelain. And this
points out that all VCSes have alternative porcelains, but git is unusual
in having convenient plumbing to support and encourage this.
-Daniel
*This .sig left intentionally blank*
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-07 19:04 ` Daniel Barkalow
@ 2007-10-07 22:31 ` Johannes Schindelin
2007-10-07 23:09 ` Shawn O. Pearce
0 siblings, 1 reply; 22+ messages in thread
From: Johannes Schindelin @ 2007-10-07 22:31 UTC (permalink / raw)
To: Daniel Barkalow
Cc: Shawn O. Pearce, Randal L. Schwartz, Paolo Ciarrocchi, git
Hi,
On Sun, 7 Oct 2007, Daniel Barkalow wrote:
> For that matter, gitweb is essentially a limited porcelain. And this
> points out that all VCSes have alternative porcelains, but git is
> unusual in having convenient plumbing to support and encourage this.
I do not consider viewers "porcelain". And gitweb is essentially just a
viewer.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-07 22:31 ` Johannes Schindelin
@ 2007-10-07 23:09 ` Shawn O. Pearce
0 siblings, 0 replies; 22+ messages in thread
From: Shawn O. Pearce @ 2007-10-07 23:09 UTC (permalink / raw)
To: Johannes Schindelin
Cc: Daniel Barkalow, Randal L. Schwartz, Paolo Ciarrocchi, git
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Sun, 7 Oct 2007, Daniel Barkalow wrote:
>
> > For that matter, gitweb is essentially a limited porcelain. And this
> > points out that all VCSes have alternative porcelains, but git is
> > unusual in having convenient plumbing to support and encourage this.
>
> I do not consider viewers "porcelain". And gitweb is essentially just a
> viewer.
So you don't consider gitk to be porcelain? I do. The plumbing
output of git-rev-list is uh, ugly. gitk may still not be the best
looking application on the internet but it sure beats looking at
rev-list output by eye.
Porcelain is really anything that calls plumbing to make the task
of invoking or processing the output of plumbing easier on the
human using it. That's it. Obviously you can work Git by just the
plumbing. Just like you can compute SHA-1 by hand. You just choose
not to as the time it would take is more than you want to invest.
Or have left in this mortal existance...
I almost always forget about the web interfaces. There's a number
of them and I don't use them often enough to really think about it.
I don't know why I always forget about them. I never forget about
StGit or qgit, and yet I never use those either...
--
Shawn.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-07 17:01 ` Shawn O. Pearce
2007-10-07 19:04 ` Daniel Barkalow
@ 2007-10-07 19:37 ` Randal L. Schwartz
1 sibling, 0 replies; 22+ messages in thread
From: Randal L. Schwartz @ 2007-10-07 19:37 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Paolo Ciarrocchi, git
>>>>> "Shawn" == Shawn O Pearce <spearce@spearce.org> writes:
Shawn> What, no mention of git-gui as a porcelain? It has more users
Shawn> than qgit according to the survey. Maybe rephrase the porcelains
Shawn> on slide 15 as:
Shawn> Other porcelain exists:
Shawn> - StGit ("stacked git"), guilt
Shawn> - tig (curses-based viewer)
Shawn> - qgit, git-gui
git-gui should have been mentioned with "the git distro". Fixed.
Shawn> On slide 26 you say "gitk mytopic origin" shows the changes back to
Shawn> the common ancestor. That's what "gitk mytopic...origin" would do.
Shawn> Note the three dots instead of the space. The space will cause
Shawn> gitk to show all history back to the beginning of time.
Darned inconsistency! Sometimes, it's a space. Sometimes it's two dots.
Sometimes, it's three dots. I know, there's reasons for that, but it's still
hard for the newbie.
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Many gits are offline this week
2007-10-05 1:27 ` Randal L. Schwartz
` (3 preceding siblings ...)
2007-10-05 9:14 ` Paolo Ciarrocchi
@ 2007-10-28 10:07 ` Mike Hommey
4 siblings, 0 replies; 22+ messages in thread
From: Mike Hommey @ 2007-10-28 10:07 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: git
On Thu, Oct 04, 2007 at 06:27:05PM -0700, Randal L. Schwartz wrote:
> >>>>> "Shawn" == Shawn O Pearce <spearce@spearce.org> writes:
>
> Shawn> Dscho and I will be (at least mostly) offline for the next four
> Shawn> days as we travel to San Jose for the 2007 Google Summer of Code
> Shawn> Mentor Summit.
>
> Oddly enough, I'm giving my "Intro to Git" talk at Google HQ on
> 12 october. Too bad you're just going to miss that. :)
Not that it's hard to find, but just for the record, Randal's talk can
be viewed on http://video.google.com/videoplay?docid=1251251453592758541
Mike
^ permalink raw reply [flat|nested] 22+ messages in thread