From: "Patrick Doyle" <wpdster@gmail.com>
To: "Alex Riesen" <raa.lkml@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: workflow question
Date: Tue, 24 Jul 2007 12:30:12 -0400 [thread overview]
Message-ID: <e2a1d0aa0707240930gb99cb0csd1ce9946d33982d@mail.gmail.com> (raw)
In-Reply-To: <81b0412b0707240837l16844dbct52ffa426d8b8547b@mail.gmail.com>
On 7/24/07, Alex Riesen <raa.lkml@gmail.com> wrote:
> On 7/24/07, Patrick Doyle <wpdster@gmail.com> wrote:
> > 2) When I don't fork a branch,
>
> this is a confusing sentence: "fork" does not happen as
> an explicit operation (if at all). You just commit somewhere
> and depending on how you look at the history you either
> see or not see a "fork".
ok, I probably should have said, "When I don't create a branch, and
when I have not yet committed any changes for the particular
feature..."
>
> > ... and I don't commit until I've completed
> > the particular feature I'm working on, I can get a fairly good idea of
> > where I am and what I was doing last (which might be 5-7 days ago,
> > given high priority interrupts on other projects, summer vacations,
> > etc...) just by running a "git status". I see that there are 7 new
> > files, and 2 modified files. I know that, when I fork my branch, I
> > can use "git diff master" to see what's different between my branch
> > and the master, but then I get the diff of all of the changes as well,
> > which is too much information. "git diff --name-only" and "git diff
> > --summary" are closer, but I can't tell what's been added vs. what's
> > been changed. Any suggestions?
>
> "git log -p ..master", or even simpler "gitk ..master"
I was hoping for something less verbose than a diff or a patch file --
something that just listed what has changed -- I'll have to
investigate whether your "my_status()" macro provides the information
for which I was looking -- thanks for the pointer.
And, as for gitk, there is something about the combination of the
screen on my laptop, my Linux installation (FC6), my X server
configuration, and/or me that makes the fonts totally unreadable. I
keep meaning to follow up on that, but I'm stuck in a
chicken-and-the-egg situation. I don't see the utility of gitk
because I can't read the display that it produces. I don't look for
the time to fix the display that it produces because, thus far, I
don't see the utility of gitk. Sigh...
> my_status() {
> git diff --cached --name-status -r -M -C HEAD -- "$@" && \
> git diff --name-status -r -M -C -- "$@"
> }
>
> Use as: my_status [pathname-limiter].
> Does not show untracked files, though.
>
Ahhh... I was looking around git-status instead of git-diff. That
makes sense now that you mention it. Someday I may have the intuitive
understanding of git that would point me in that direction myself, but
I ain't there yet :-)
Thanks.
--wpd
next prev parent reply other threads:[~2007-07-24 16:30 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-24 13:53 workflow question Patrick Doyle
2007-07-24 15:37 ` Alex Riesen
2007-07-24 16:30 ` Patrick Doyle [this message]
2007-07-24 16:35 ` Julian Phillips
2007-07-24 20:54 ` Alex Riesen
2007-07-24 20:57 ` Alex Riesen
2007-07-24 21:00 ` J. Bruce Fields
2007-07-24 21:38 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2007-09-25 16:43 Workflow question Russ Brown
2007-09-25 19:09 ` Andreas Ericsson
2007-09-25 19:34 ` Jeff King
2007-09-25 19:50 ` Wincent Colaiuta
2007-09-25 20:20 ` Jeff King
2007-09-25 20:37 ` Wincent Colaiuta
2007-09-25 19:42 ` Russ Brown
2007-09-25 20:17 ` Jeff King
2007-09-25 20:56 ` Russ Brown
2007-09-25 21:28 ` Junio C Hamano
2007-09-26 0:01 ` Russ Brown
2007-09-26 0:47 ` Jeff King
2007-09-26 1:51 ` Karl Hasselström
2007-09-26 2:55 ` Russ Brown
2007-09-26 5:29 ` Junio C Hamano
2007-09-26 12:42 ` Jeff King
2007-09-25 22:38 ` Andreas Ericsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e2a1d0aa0707240930gb99cb0csd1ce9946d33982d@mail.gmail.com \
--to=wpdster@gmail.com \
--cc=git@vger.kernel.org \
--cc=raa.lkml@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).