Hi Johannes,
So, I tried recreating the problem:
git clone git://github.com/JohannesKlug/hummingbird.git
So, I want to retry the same merge locally and see if I get the same
results. The merge commit has two parents, I'll create two branches based on
each of these commits.
The first commit:
Hi Barry,
Do you know exactly how CruiseControl updates the repository (pulls)?
Can you paste the .git/config from the CruiseControl repo?
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To post to this group, send email to
Thomas, thank you very much for spending your time looking into this.
I suppose we'll just live with every file being touched by this merge,
and continue from here.
Maybe egit caused this?
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
I have attached a testcase shell script. I want to downgrade a sub-project,
but can't figure out how.
...
Here's what I tried:
git checkout -b downgrade-subproject-to-v2
git rebase -s subtree -X subtree=subproject --onto v2
downgrade-subproject-to-v2
But I see the contents of the
So in my .git/hooks folder I have a file named post-commit that looks like
this:
#!/bin/sh
rm version.txt -i
git describe --tags version.txt
Basically the idea being that after every commit, I write the git describe
to a file in my repository called version.txt. This script works fine
