On 23.07.2012 20:37, Junio C Hamano wrote:
This patch makes sense to me, but at the same time makes [PATCH 1/5]
a "Meh", methinks.
Yeah, I can see why. So I've renamed __git_mergetools_common to
__git_diffmerge_tools and squashed with [PATCH 1/5] to make it
less "Meh" as it does not stand on i
Sebastian Schuberth writes:
>> This patch makes sense to me, but at the same time makes [PATCH 1/5]
>> a "Meh", methinks.
>
> Yeah, I can see why. So I've renamed __git_mergetools_common to
> __git_diffmerge_tools and squashed with [PATCH 1/5] to make it
> less "Meh" as it does not stand on its o
On 23.07.2012 18:46, Junio C Hamano wrote:
>> +# Tools that support both merging and diffing.
>> __git_mergetools_common="araxis bc3 diffuse ecmerge emerge gvimdiff
>> kdiff3 meld opendiff p4merge tkdiff vimdiff xxdiff
>> "
>
> As the set of merge capable tools is not a s
Sebastian Schuberth writes:
> Also, add a few comments that clarify the meaning of these variables.
>
> Signed-off-by: Sebastian Schuberth
> ---
> contrib/completion/git-completion.bash | 11 +--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/completion/git-c
Also, add a few comments that clarify the meaning of these variables.
Signed-off-by: Sebastian Schuberth
---
contrib/completion/git-completion.bash | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-com
5 matches
Mail list logo
