Hi there,
I try to follow the best practice of regular repo maintenance, which
afaik consists of running `git gc` every week or so.
So I thought I had a well-maintained repository, and was quite
surprised to discover some very large .git/objects/pack/tmp_* files,
which apparently are entirely nee
developers change this default, or at
least let us override it for the builtin invocations.
Finally, if you're not using mergetools, how do you resolve conflicts?
On Sun, Nov 27, 2016 at 12:08 AM, Jeff King wrote:
> On Sat, Nov 26, 2016 at 09:44:36PM -0500, Dun Peal wrote:
>
>&
I'm using vimdiff as my mergetool, and have the following lines in ~/.gitconfig:
[merge]
tool = vimdiff
[mergetool "vimdiff"]
trustExitCode = true
My understanding from the docs is that this sets
mergetool.vimdiff.trustExitCode to true, thereby concluding that a
merge hasn't been success
it does work as
expected.
Thanks, D.
On Sun, Oct 12, 2014 at 7:53 PM, Duy Nguyen wrote:
> On Sun, Oct 12, 2014 at 9:58 AM, Dun Peal wrote:
>> I have the pattern `*.out` defined in my `core.excludesfile`.
>> According to the documentation[1], patterns defined in
>> `$GIT_DI
likely to
want to override global exclusions for a specific project, than
override specific project settings with a global exclusion file (that
last one really makes no sense imho).
Thoughts?
On Sat, Oct 11, 2014 at 10:58 PM, Dun Peal wrote:
> I have the pattern `*.out` defined in my `core
I have the pattern `*.out` defined in my `core.excludesfile`.
According to the documentation[1], patterns defined in
`$GIT_DIR/info/exclude` take precedence over `core.excludesfile`, so
for one particular project that needs to track some `.out` files, I
created `$GIT_DIR/info/exclude` with just one
Hi,
I am getting this error every time I pull. All the following have been
executed, but failed to remove this warning:
git prune
git prune --expire now
git gc
git gc --aggressive
What should I do?
Thanks, D.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a mes
7 matches
Mail list logo
