Stefan Beller writes:
> I'll send a patch fixing the docs, though with this thought, maybe we need
> to fix other commands, that produce commits as well?
> (git revert, others?)
I do not think "commands that create commits" is not a good
criteria. "git notes" and "git
On Fri, Sep 15, 2017 at 11:22 PM, Kaartic Sivaraam
wrote:
> Seems 'Documentation/githooks.txt' needs an update related to this
> change. Previously it said(note the **s) that 'commit-msg' is invoked
> only by 'git commit',
>
> commit-msg
>This hook
Seems 'Documentation/githooks.txt' needs an update related to this
change. Previously it said(note the **s) that 'commit-msg' is invoked
only by 'git commit',
commit-msg
This hook is invoked by git commit**, and can be bypassed with the
--no-verify option. It takes a
On Thu, Sep 7, 2017 at 6:13 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> The --no-verify option however is not remembered across invocations
>> of git-merge. Originally the author assumed an alternative in which the
>> 'git merge --continue'
Stefan Beller writes:
> The --no-verify option however is not remembered across invocations
> of git-merge. Originally the author assumed an alternative in which the
> 'git merge --continue' command accepts the --no-verify flag, but that
> opens up the discussion which
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook: When a merge is stopped due
to conflicts or --no-commit, the subsequent commit calls the commit-msg
hook. However, it is not called after a clean merge. Fix this
inconsistency by
Stefan Beller writes:
>> I also thought that we were hunting calls of cmd_foo() from outside
>> the git.c command dispatcher as grave errors and want to clean up
>> the codebase to get rid of them.
>
> ... but I did not account for this fact. (I was not aware of these being
>
On Tue, Sep 5, 2017 at 6:57 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Junio writes:
>>> I didn't check how "merge --continue" is implemented, but we need to
>>> behave exactly the same way over there, too. Making sure that it is
>>> a case in
Stefan Beller writes:
> Junio writes:
>> I didn't check how "merge --continue" is implemented, but we need to
>> behave exactly the same way over there, too. Making sure that it is
>> a case in t7504 may be a good idea, in addition to the test you
>> added.
>
> After
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook: When a merge is stopped due
to conflicts or --no-commit, the subsequent commit calls the commit-msg
hook. However, it is not called after a clean merge. Fix this
inconsistency by
Stefan Beller writes:
> Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
> merge should also honor the commit-msg hook; the reason is the same as
> in that commit: When a merge is stopped due to conflicts or --no-commit,
> the subsequent commit calls
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14)
merge should also honor the commit-msg hook; the reason is the same as
in that commit: When a merge is stopped due to conflicts or --no-commit,
the subsequent commit calls the commit-msg hook. However, it is not
called after
Hi.
I'm running a speciallized commit-msg hook to help me fill out commit
messages. This all works nicely for alle commits except for merges.
What I normally do to circumvent this is this :
$ git merge somebranch
here I append to autogenerated message with my own text
$ git commit --ammend
13 matches
Mail list logo