Re: [PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Junio C Hamano
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

Re: [PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Sebastian Schuberth
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

Re: [PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Junio C Hamano
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

Re: [PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread David Aguilar
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` >>> -

Re: [PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Sebastian Schuberth
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

Re: [PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Junio C Hamano
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:

[PATCH] mergetool: support --tool-help option like difftool does

2012-07-23 Thread Sebastian Schuberth
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