From: "Jay Soffian" <jaysoffian@gmail.com>
To: "Daniel Barkalow" <barkalow@iabervon.org>
Cc: "Jakub Narebski" <jnareb@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
git@vger.kernel.org
Subject: Re: Which freedesktop.org "design flaws" in git are still relevant?
Date: Fri, 29 Feb 2008 17:40:36 -0500 [thread overview]
Message-ID: <76718490802291440x60896c93i26d8d0c2cf5678b2@mail.gmail.com> (raw)
In-Reply-To: <alpine.LNX.1.00.0802291614230.19665@iabervon.org>
On Fri, Feb 29, 2008 at 4:58 PM, Daniel Barkalow <barkalow@iabervon.org> wrote:
> I wonder if it would be nice to have per-branch aliases, so that you
> could have "git update" do whatever is appropriate to update this
> particular branch, whether it be "git pull --no-commit" or "git reset
> --hard origin/next && git merge" or "git rebase".
Well, you effectively have this via
branch.*.{merge,mergeoptions,rebase,remote}. e.g.:
To effect fetch + non-committing merge:
branch.<name>.remote = origin
branch.<name>.merge = refs/heads/<name>
branch.<name>.mergeoptions = --no-commit
To effect fetch + rebasing:
branch.<name>.remote = origin
branch.<name>.merge = refs/heads/<name>
branch.<name>.rebase = true
(Not sure if there is a way to get "rebase -m" though...)
To effect reset --hard origin/next, add another fetch line to your
remote. e.g.:
[remote "origin"]
url = git://git.kernel.org/pub/scm/git/git.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = refs/heads/pu:/refs/heads/pu-readonly
Now "git pull" does the right thing whichever branch I'm on.
j.
next prev parent reply other threads:[~2008-02-29 22:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-29 20:32 Which freedesktop.org "design flaws" in git are still relevant? Elijah Newren
2008-02-29 20:56 ` Nicolas Pitre
2008-02-29 21:16 ` Jakub Narebski
2008-02-29 21:11 ` Jakub Narebski
2008-02-29 21:50 ` Junio C Hamano
2008-02-29 21:58 ` Daniel Barkalow
2008-02-29 22:40 ` Jay Soffian [this message]
2008-02-29 22:52 ` Jay Soffian
2008-02-29 22:58 ` Daniel Barkalow
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=76718490802291440x60896c93i26d8d0c2cf5678b2@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=newren@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).