I'm trying to merge a hotfix into the master branch. What am I doing wrong?
(on master):
keybounceMBP:Finite-Fluids michael$ git merge ReleaseAlpha40..HotFixFluidLost
merge: ReleaseAlpha40..HotFixFluidLost - not something we can merge
What's going on: ReleaseAlpha40 and master have a common ances
Hi everyone,
I have a script for automating generation of git patch files.
For this I need to know which files were changed and which were added after
applying a given patch, immediately after applying it finished succesfully.
Now, I can find out which files were changed as a result of applying
Hello,
You may want to play with gc.pruneexpire. From man git-config:
gc.pruneexpire
>When git gc is run, it will call prune --expire 2.weeks.ago.
>Override the grace period with this config variable. The value
>"now" may be used to disable this grace pe
> mike :
> I have had a branch, feature_xyz, for a long time ( yes I know I should not
> but it was not my call). Problem is I have not updated it with changes from
> master. So I started to do a regular rebase ( i want to keep history):
> git fetch origin master
> git rebase origin/master
> Igor Deyashkin :
> What are you expect from git gc in your case?
I didn't *expect* anyhing, but what I *hoped* for was a way for git to
compress the repository as much as it could on each push.
Ie. compress it as much as what I get when I cd into the bare repo on
the remote and do a
git g
