On Fri, Feb 29, 2008 at 4:58 PM, Daniel Barkalow <barkalow@xxxxxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
