xactly in the places where English version changed.
Sometimes though, e.g. when a new chapter is added to upstream, the merge just
goes through "successfully".
That's what I'd like to avoid, as all changes need to be human-controlled.
---
Ilya Kantor
https://javascript.info
&g
Hi,
We're using Git to manage translations of an open-source book, and most of time
it works well. But there's also a problem.
When we pull changes from upstream (English) to translation (e.g. Japanese),
git auto-merges them.
Sometimes there conflicts, but not all the time.
For example, when
Hi,
If that's indeed true (as far as I could see that, still can be
mistaken), then as a git user, not developer, I'd stick to --no-ff,
because it's the more intuitive naming.
Just 5ยข.
---
Best Regards,
Ilya Kantor
On Thu, May 10, 2018 at 9:34 PM, Marc Branchaud wrote:
> O
se --force-rebase -i 54a4
git rebase --no-ff -i 54a4
(picks all 3 commits of feature)
Is there a case where --no-ff differs from --force-rebase?
---
Best Regards,
Ilya Kantor
On Wed, May 9, 2018 at 10:27 PM, Marc Branchaud wrote:
> On 2018-05-09 02:21 PM, Stefan Beller wrote:
>>
>&
l.
Probably, there was a difference some time ago, but not now?
Then one of them can be safely deprecated.
---
Best Regards,
Ilya Kantor
Let's say master..feature has 2 commits: A and B.
Then `git cherry-pick -n master..feature` should pick-up A and then B
into the working directory and the index.
If applying A leads to a conflict, then it stops on A, like here:
>>> git cherry-pick -n master..feature
>> error: could not apply 2c11
check that prevents --continue and should be fixed?
---
Best Regards,
Ilya Kantor
. Not sure if it's a bug
or not.
---
Best Regards,
Ilya Kantor
ck?
I couldn't find such use of rerere in the internet.
How can I save the merge/restore progress otherwise?
---
Best Regards,
Ilya Kantor
...It seems sane to git gc --auto from command that are expected to take time.
That's probably the reason why it's not called on commits and called on
receive-pack.
But then why call it on merges? Especially on those that have no conflicts and
should run fast.
Also, merges are not supposed to
ments? Why there?
In particular, gc --auto was called in commits earlier, but not in the
recent versions of git.
---
Best Regards,
Ilya Kantor
ary = true together
with textconv?
There is an example in docs:
[diff "ps"]
textconv = ps2ascii
binary = true
...But what binary = true does here?
Even if we remove it, textconv is called for all ps-files.
---
Best Regards,
Ilya Kantor
Current HTML header regexp doesn't match headers without attributes.
So it fails to match ..., while ... matches.
The fix makes attributes optional.
The regexp is still far from perfect, but now it at least handles the
common case.
Signed-off-by: Ilya Kantor
---
userdiff.c | 2 +-
1
13 matches
Mail list logo
