Am 24.08.2012 10:31, schrieb David Aguilar:
> On Thu, Aug 23, 2012 at 10:39 AM, Junio C Hamano wrote:
>> David Aguilar writes:
>>> Would the ability to resolve the various merge situations using
>>> the command-line be a wanted addition?
>>>
>>> This would let a submodule or deleted/modified enco
On Thu, Aug 23, 2012 at 10:39 AM, Junio C Hamano wrote:
> David Aguilar writes:
>> Would the ability to resolve the various merge situations using
>> the command-line be a wanted addition?
>>
>> This would let a submodule or deleted/modified encountering
>> user do something like:
>>
>> $ git mer
David Aguilar writes:
>> After hinting a low-hanging-fruit that would be an easy way for new
>> people to dip their toes, I saw no takers for one month, so I ended
>> up doing it myself.
>
> My bad,...
Not yours. These hints I drop from time to time are meant for eager
new people who want to di
On Wed, Aug 22, 2012 at 10:33 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> This way we do not have to risk the list of tools go out of sync
>> between the implementation and the documentation.
>>
>> Signed-off-by: Junio C Hamano
>> ---
>> Junio C Hamano writes:
>>
+--tool-help::
Junio C Hamano writes:
> This way we do not have to risk the list of tools go out of sync
> between the implementation and the documentation.
>
> Signed-off-by: Junio C Hamano
> ---
> Junio C Hamano writes:
>
>>> +--tool-help::
>>> + List the supported and available diff tools.
>>
>> This par
Sebastian Schuberth writes:
> On Mon, Jul 23, 2012 at 11:16 PM, Junio C Hamano wrote:
>
>> There are only five or six classes of environment that matter in the
>> real world for the purpose of giving "well known" examples: Windows,
>> MacOS X, Gnome, KDE and Linux terminal. By picking a represe
On Mon, Jul 23, 2012 at 11:16 PM, Junio C Hamano wrote:
> There are only five or six classes of environment that matter in the
> real world for the purpose of giving "well known" examples: Windows,
> MacOS X, Gnome, KDE and Linux terminal. By picking a representative
> one from each and listing
have
heard of Gnome tools even if they do not use the environment on
their platforms, Windows users tend to be isolated bunch, so it
would not hurt to include at least one well-known Windows-only tool
in the list.
> Yes, indeed, it is arbitrary. It does have some merit, though--it is
> also a
On Mon, Jul 23, 2012 at 1:14 PM, Sebastian Schuberth
wrote:
> On Mon, Jul 23, 2012 at 9:52 PM, Junio C Hamano wrote:
>
>>> -t ::
>>> --tool=::
>>> - Use the diff tool specified by . Valid values include
>>> - emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help`
>>> -
On Mon, Jul 23, 2012 at 9:52 PM, Junio C Hamano wrote:
>> -t ::
>> --tool=::
>> - Use the diff tool specified by . Valid values include
>> - emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help`
>> - for the list of valid settings.
>> + Use the diff tool specified
Sebastian Schuberth writes:
> This way we do not have to risk the list of tools go out of sync
> between the implementation and the documentation. Adjust the documentation
> accordingly to not explicitly list the tools but refer to --tool-help.
>
> Signed-off-by: Junio C Hamano
> Signed-off-by:
This way we do not have to risk the list of tools go out of sync
between the implementation and the documentation. Adjust the documentation
accordingly to not explicitly list the tools but refer to --tool-help.
Signed-off-by: Junio C Hamano
Signed-off-by: Sebastian Schuberth
---
Documentation/g
On 23.07.2012 19:21, Junio C Hamano wrote:
> This way we do not have to risk the list of tools go out of sync
> between the implementation and the documentation.
>
> Signed-off-by: Junio C Hamano
Thanks! I've squashed this with
[PATCH v2 5/5] Add a few more code comments and blank lines in gue
This way we do not have to risk the list of tools go out of sync
between the implementation and the documentation.
Signed-off-by: Junio C Hamano
---
Junio C Hamano writes:
>> +--tool-help::
>> +List the supported and available diff tools.
>
> This part is a good addition (but it already is
14 matches
Mail list logo
