Hello Benoit,
> Akim Demaille would also like it to squash the commits added by the
> merge (the new commits in OTHERS):
>
> -MM-DD Author <[EMAIL PROTECTED]>
>
> Merge whatever:
>
> -MM-DD Someone Else <[EMAIL PROTECTED]>
> Some change.
> * FileChanged.c:
On Oct 9, 2007, at 2:03 PM, Bruno Haible wrote:
Hello Benoit,
Thanks for working on this. But this merge driver has a few major
nits.
1) While my ChangeLog file was locally unmodified but some pulled
in commits
should modify it, "git pull" stopped and said:
ChangeLog: needs update
f
Eric Blake <[EMAIL PROTECTED]> wrote:
> test-fpending.c blindly writes to stdout:
>
> | PASS: test-fflush.exe
> | fooPASS: test-fpending.exe
> | PASS: test-fpurge.exe
>
> I'm committing this to silence it from the user's perspective.
Thanks.
Bruno Haible clisp.org> writes:
>
> > The change looks fine. You're welcome to commit it.
>
> Committed.
>
test-fpending.c blindly writes to stdout:
| PASS: test-fflush.exe
| fooPASS: test-fpending.exe
| PASS: test-fpurge.exe
I'm committing this to silence it from the user's perspective.
Hi,
After a long time, I updated MODULES.html.sh to show the many new added
modules in the right categories.
2007-10-09 Bruno Haible <[EMAIL PROTECTED]>
* MODULES.html.sh (func_module): Don't create a hyperlink for
function names like 'printf_frexp'.
(Misc): Add crc, me
Hello Benoit,
Thanks for working on this. But this merge driver has a few major nits.
1) While my ChangeLog file was locally unmodified but some pulled in commits
should modify it, "git pull" stopped and said:
ChangeLog: needs update
fatal: Entry 'ChangeLog' not uptodate. Cannot merge.
[I c
Hi,
On Mon, 8 Oct 2007, Benoit SIGOURE wrote:
> [as usual, I forgot the attachment...]
Two comments:
- by not inlining you made it hard to review your script. Therefore I
will not do it.
- Try to avoid naming the script git-merge-*; these scripts/programs are
merge _strategies_, not mer
