On Mon, Mar 11, 2013 at 5:03 AM, Junio C Hamano wrote:
> Paul Campbell writes:
>
>> From: bibendi
>>
>> For each subtree listed in .gittrees perform a push or a pull.
>>
>> Signed-off-by: Paul Campbell
>>
>> Conflicts:
>> contrib/subtree/git-subtree.sh
>
> The "Conflicts:" part is totally
Paul Campbell writes:
> From: bibendi
>
> For each subtree listed in .gittrees perform a push or a pull.
>
> Signed-off-by: Paul Campbell
>
> Conflicts:
> contrib/subtree/git-subtree.sh
The "Conflicts:" part is totally irrelevant. Please remove.
> ---
> contrib/subtree/git-subtree.sh
From: bibendi
For each subtree listed in .gittrees perform a push or a pull.
Signed-off-by: Paul Campbell
Conflicts:
contrib/subtree/git-subtree.sh
---
contrib/subtree/git-subtree.sh | 25 ++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/contrib
3 matches
Mail list logo