From: "Alex Riesen" <raa.lkml@gmail.com>
To: "Patrick Doyle" <wpdster@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: workflow question
Date: Tue, 24 Jul 2007 17:37:43 +0200 [thread overview]
Message-ID: <81b0412b0707240837l16844dbct52ffa426d8b8547b@mail.gmail.com> (raw)
In-Reply-To: <e2a1d0aa0707240653x55dd82b3pf9e3986f5c3bb344@mail.gmail.com>
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".
> ... 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"
> As an aside, is there an undocumented option to "git status" to
> produce a less verbose report of what's been changed and what's not
> checked in? Perhaps a single line per file with a one or two letter
> indication of the status of the file followed by the name? If not,
> would there be any violent objections to my submitting a patch to add
> such a feature?
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.
next prev parent reply other threads:[~2007-07-24 15:37 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 [this message]
2007-07-24 16:30 ` Patrick Doyle
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=81b0412b0707240837l16844dbct52ffa426d8b8547b@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=wpdster@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).