From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7317 invoked by alias); 7 Apr 2013 19:49:11 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 31236 Received: (qmail 3283 invoked from network); 7 Apr 2013 19:48:59 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 Received-SPF: pass (ns1.primenet.com.au: SPF record at ruderich.org designates 178.63.68.96 as permitted sender) Date: Sun, 7 Apr 2013 21:48:53 +0200 From: Simon Ruderich To: zsh-workers@zsh.org Subject: Re: One-command mail import with X-Seq: and ChangeLog Message-ID: <20130407194853.GA15992@ruderich.org> References: <20121213145747.GB9597@ruderich.org> <87sj7ixgxo.fsf@ft.bewatermyfriend.org> <20130317145507.GA21498@ruderich.org> <20130404133802.GA29933@ruderich.org> <87bo9sc3ux.fsf@ft.bewatermyfriend.org> <130407120749.ZM543@torch.brasslantern.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="=_zucker.schokokeks.org-2396-1365364134-0001-2" Content-Disposition: inline In-Reply-To: <130407120749.ZM543@torch.brasslantern.com> User-Agent: Mutt/1.5.21 (2013-03-19) --=_zucker.schokokeks.org-2396-1365364134-0001-2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 07, 2013 at 12:07:49PM -0700, Bart Schaefer wrote: > The one thing I'm finding missing from both places is a discussion of > how to perform a simple one-file (well, two, counting ChangeLog) push > directly from a clone of the master. Can I --amend a commit without > having a branch, or must I wait even to commit until I've edited the Technically you're always on a branch (ignoring detached HEAD here), it's just the master branch and not a special branch created for a specific feature. Of course you can --amend on the master branch without creating a new feature branch (in Git all branches are equal). Don't --amend anything public though, e.g. nothing which is already in origin/master. > ChangeLog? Or is creating a branch THE way, and I should ignore all > the discussion of branching for "a feature" and just create a branch > that's always there and use it repeatedly whenver I edit? Normally you're on the master branch which tracks the remote branch origin/master. How you work with this branch depends on your workflow. Some people prefer to always create new branches for specific features, this is the workflow described by Frank, others just work on master for small features (e.g. the one file change you just mentioned) and push that to the remote. It depends what you like better. =46rom Git's point-of-view you don't have to create any new branches at all, but it's sometimes/often useful. Personally I don't use any extra branches for small features, but that just my preference. Using _one_ extra branch repeatedly is not necessary in Git, as branches are very cheap. If you want a new branch for this feature, just create it (with an appropriate name) and remove it later once the changes are merged/pushed to origin/master just as Frank described. One the other hand if you don't need a specific feature branch, just work on master. Regards Simon --=20 + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 --=_zucker.schokokeks.org-2396-1365364134-0001-2 Content-Type: application/pgp-signature; name="signature.asc" Content-Transfer-Encoding: 7bit Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCgAGBQJRYc2lAAoJEJL+/bfkTDL5YFQP/2+iUMN6LSD6bPy/K9XaJY4s 2kxxU2BClc+X0acCLoxVcR1TuarQgQqMm4LHkmq3PvVaLUFbdXQq03o6B6J9kK8d 88dcMcpTGl/Ql/PdJVd2aezcFg7CxHvRfCby5T3oGv/o1XNGxuX4zCQnjCEMbXJ8 Xep8wGnLmfXb9hGBeqzFCI1rSqts1exH7O/qLpGBodFAmwmfWHgbvge9OiFIiXPb BJ4q9x/aWv3zWk1LXIt/9tShgLfmhtWdnKX4Ib83L/XN/5ABC7Xt4avWiO2FyhzI I9gv1JjF5FeR7QrE+lr4JNWDy1qu1JT7djn4Nw9AUE3pxOoRgyRhyfpnFR5tHc0k Um0QGgaVcOKmrlBe/A9uzHaGgdR1kTzz12MazizkEYpcKtYJEbK3uayR0mg+IDSU gmVWbQfMnxbthkfw0vOrBCIj/lnxdZHY4qnC6ZJRJ4U2qbdLFhGBT38gCmoB6Zfb 7e8g++P1g3OEkZw6hpbA4Yl+8nng+tWwKo3vJv0T8/bHgwfV3CF2m4eQqoly21OW NYmPu3d1z/SeD6U9T6M6YLeQGZcSJBs4vIsJgNnuIeySlPBJ2ZrWOMbHC7AnpLZc tNaReMbJPKLP5OtJ6H8Qdih6Eo0+/vZ+YElzOs4S8/pFeUH6gTseKpQ1Ew8oFhGG U+uXKLCxMH6PRRH0CoNf =Nj02 -----END PGP SIGNATURE----- --=_zucker.schokokeks.org-2396-1365364134-0001-2--