Re: Re*: mergetool: support --tool-help option like difftool does

2012-08-26 Thread Jens Lehmann
Am 24.08.2012 10:31, schrieb David Aguilar: On Thu, Aug 23, 2012 at 10:39 AM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com writes: Would the ability to resolve the various merge situations using the command-line be a wanted addition? This would let a submodule or

Re: Re*: mergetool: support --tool-help option like difftool does

2012-08-24 Thread David Aguilar
On Thu, Aug 23, 2012 at 10:39 AM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com 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

Re: Re*: mergetool: support --tool-help option like difftool does

2012-08-23 Thread David Aguilar
On Wed, Aug 22, 2012 at 10:33 PM, Junio C Hamano ju...@pobox.com wrote: Junio C Hamano gits...@pobox.com 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 gits...@pobox.com --- Junio C

Re*: mergetool: support --tool-help option like difftool does

2012-08-22 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com 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 gits...@pobox.com --- Junio C Hamano gits...@pobox.com writes: +--tool-help:: + List the supported

Re: mergetool: support --tool-help option like difftool does

2012-07-23 Thread Sebastian Schuberth
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 gits...@pobox.com Thanks! I've squashed this with [PATCH v2 5/5] Add a few more code comments and