From: "Brian Scott Dobrovodsky" <brian@pontech.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org
Subject: Re: Data Integrity & un-Commited Branches
Date: Fri, 14 Sep 2007 23:24:42 -0700 [thread overview]
Message-ID: <2a8a071a0709142324i29a863b7x8c164a589c1f1f9a@mail.gmail.com> (raw)
In-Reply-To: <20070915025129.GY3099@spearce.org>
> My point is just that some people actually assume that work done
> while having one branch checked out is related to that branch and
> that branch alone and that switching a branch should put that work
> on hold. Unfortunately for me some of these people at day-job have
> also just assumed Git can read their mind and forget to switch
> branches at the proper times, resulting in unrelated work mashed
> together for days straight (and criss-crossed merge to hell and back)
> before they call me and say "MAKEITWORKNOW".
> </rant>
As I have learned over the years, assumptions can be fatal. I can not
use something until I wrap my head around it and test it. Especially
for managing something in production! So far, this has been the only
problem/mis-understanding.
> It isn't unreasonable to want Git to save uncommitted work for the
> current branch and then you switch to another, ending up with a
> clean working directory when you finally get there. Today we have
> git-stash to help you with this, but I'm thinking maybe we want to
> connect git-checkout with it?
That would be great as a default action when using checkout!
+Switching branches without having to commit improves work flow.
+Fewer commits = cleaner logs.
+More Intuitive!
I am currently using git-1.5.1.6, which apparently does not have
git-stash. I will upgrade and check it out.
Cheers,
--
Brian Scott Dobrovodsky
next prev parent reply other threads:[~2007-09-15 6:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <2a8a071a0709140028o472bcr8c82bd88e37cc4e9@mail.gmail.com>
[not found] ` <2a8a071a0709140036l5db62c0fl5af01f75f35610ba@mail.gmail.com>
[not found] ` <7vk5qtd3le.fsf@gitster.siamese.dyndns.org>
2007-09-15 0:40 ` Data Integrity & un-Commited Branches Brian Scott Dobrovodsky
2007-09-15 2:51 ` Shawn O. Pearce
2007-09-15 6:24 ` Brian Scott Dobrovodsky [this message]
2007-09-15 6:32 ` Shawn O. Pearce
2007-09-15 6:37 ` Junio C Hamano
2007-09-15 7:14 ` Brian Scott Dobrovodsky
2007-09-15 7:38 ` Jan Hudec
2007-09-15 7:51 ` Shawn O. Pearce
2007-09-15 13:11 ` Nikodemus Siivola
2007-09-15 13:59 ` David Kastrup
2007-09-15 17:14 ` Nikodemus Siivola
2007-09-15 17:33 ` David Kastrup
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=2a8a071a0709142324i29a863b7x8c164a589c1f1f9a@mail.gmail.com \
--to=brian@pontech.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/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).