Yes that makes sense.
I was not aware of custom merge drivers, but indeed that may address
my situation. I'll look into it.
Thanks!
On Tue, Nov 15, 2016 at 12:51 PM, Junio C Hamano wrote:
> John Rood writes:
>
>> On Thu, Nov 3, 2016 at 10:57 AM, John Rood wrote:
>>>
Is there any push-back on this, or is there a backlog that we can add
this feature to?
On Thu, Nov 3, 2016 at 10:57 AM, John Rood wrote:
> If the contents of a file initially are:
> one
>
> three
> and on branch A there is a commit, removing the blank line:
> one
>
If the contents of a file initially are:
one
three
and on branch A there is a commit, removing the blank line:
one
three
and on branch B there is a commit, adding 'two':
one
two
three
Normally, if you try to merge A into B (or B into A), git recognizes a
decision needs to be made bet
away from leaving messages at
all.
On Thu, Oct 27, 2016 at 5:51 PM, Junio C Hamano wrote:
> John Rood writes:
>
> [administrivia: do not top post]
>
>> What I'm really seeking is not a make-shift solution for myself, but
>> an intuitive solution for the novice user-ba
What I'm really seeking is not a make-shift solution for myself, but
an intuitive solution for the novice user-base at large.
On Thu, Oct 27, 2016 at 5:27 PM, Junio C Hamano wrote:
> John Rood writes:
>
>> I suppose I can do git config --global core.editor notepad
>> Ho
, the user isn't issuing the "git commit" command, and so
he/she doesn't have the opportunity to use the -m flag.
On Thu, Oct 27, 2016 at 5:30 PM, Stefan Beller wrote:
> On Thu, Oct 27, 2016 at 2:55 PM, John Rood wrote:
>> Users should be able to configure Git to not
Thu, Oct 27, 2016 at 5:05 PM, John Rood wrote:
> Unfortunately, in my case I'm on windows (my company's choice, not mine).
>
> On Thu, Oct 27, 2016 at 5:01 PM, Stefan Beller wrote:
>> On Thu, Oct 27, 2016 at 2:55 PM, John Rood wrote:
>>> Users should be able to con
Unfortunately, in my case I'm on windows (my company's choice, not mine).
On Thu, Oct 27, 2016 at 5:01 PM, Stefan Beller wrote:
> On Thu, Oct 27, 2016 at 2:55 PM, John Rood wrote:
>> Users should be able to configure Git to not send them into a Vim editor.
>
> See htt
Users should be able to configure Git to not send them into a Vim editor.
When users pull commits, and a new commit needs to be created for a
merge, Git's current way of determining a commit message is to send
the user into a Vim window so that they can write a message. There are
2 reasons why thi
9 matches
Mail list logo
