Hi,
On Tue, 3 Jul 2007, Jeff King wrote:
On Mon, Jul 02, 2007 at 11:23:15PM -0400, linux@horizon.com wrote:
quoted
And until git-merge-ff is available, what's the recommended way to
"advance master to tag <foo>, but only if that wouldn't lose anything?"
You can ask "do I have anything that foo doesn't?":
test "`git-rev-list foo.. | wc -l`" -gt 0
If it is only the test, you can do that by
test $(git merge-base foo bar) = $(git rev-parse foo)
(which tests if foo is a stricth ancestor of bar). Although in your
(linux@horizon.com's) place I would really look at "git log foo.." myself,
as peff almost suggested.
For if you (linux@horizon.com) _have_ changes, you want to know which
changes they are, right?
Of course, it seems to me that what you (linux@horizon.com; do you really
have no proper name?) _really_ wanted to do is "git rebase v2.6.22-rc7".
Ciao,
Dscho