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:
When it comes to resolving the "problem", you've got three options, I guess:
1) Leave it like it is and keep on working
2) Force a rewrite of history onto the github master branch. This will
create problems for anyone who have already cloned with the latest changes
3) Abandon the master branch an
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 git-users@g
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.
Hm, that could be.
If you can reproduce the problem, maybe this is a bug in EGit that should be
reported.. My local EGit installation is a bit outdated so I can't test
myself at the moment.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" gro
> 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
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
On Thu, Apr 28, 2011 at 01:36:27PM -0700, Greg Moser wrote:
> 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
Maybe this is a bit too challenging for us :)
Try the main git list: http://vger.kernel.org/vger-lists.html#git
--
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 git-users@googlegroups.com.
To unsubscr
So the file needs to be part of the repository because the application is
installed by downloading the zipball directly from github... There is no
"build process" per say. Every push to the master branch is an offical
release, and every push to the develop branch is a bleeding edge release. I
I would recommend studying git.git's Makefile and seeing how they generate
their version file. It doesn't use a hook; it's part of the build.
--
David
On Apr 28, 2011, at 1:36 PM, Greg Moser wrote:
> So in my .git/hooks folder I have a file named post-c
11 matches
Mail list logo
