a result I lost interest.
On Tue, Jul 9, 2013 at 10:21 AM, Herman van Rink wrote:
> On 08-07-13 17:20, Gareth Collins wrote:
>>
>> Hello Fredrik,
>>
>> Thanks for the suggestion! Adding in Paul Campbell and Herman Van Rink
>> who worked on this before.
>
25, 2013 at 11:00 AM, Herman van Rink wrote:
> On 22-07-13 21:35, Paul Campbell wrote:
>>
>> Hi,
>>
>> Sorry for the delay. Not been monitoring the list lately.
>>
>> I'm afraid work stopped for two reasons. Lack of interest from the
>> list was
On Thu, Mar 14, 2013 at 3:30 AM, Junio C Hamano wrote:
> Miles Bader writes:
>
>> Paul Campbell writes:
>>> James and Michael's patches add if clauses that use the
>>> bashism 'if []' rather than 'if test'.
>>
>> "Bashism&
Don't explicitly use the Bash shell but allow the system to provide a
hopefully POSIX compatible shell at /bin/sh.
Signed-off-by: Paul Campbell
---
Only the system's I was able to test this on (Debian squeeze) /bin/sh is
the dash shell.
contrib/subtree/git-subtree.sh | 2 +-
1 file
Use of -a and -o in the [ command can have confusing semantics.
Use a separate test invocation for each single test, combining them with
&& and ||, and use ordinary parentheses for grouping.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 14 +++---
1 file ch
options have been replaced with printf.
say_progress() is added to mirror the behaviour of say() in respecting
the -q/--quiet option.
Signed-off-by: Paul Campbell
---
This is a better version of the previously submitted patch
(http://article.gmane.org/gmane.comp.version-control.git/218103) which
git-subtree is considered to be a Bash only script and not POSIX
compatibile.
I removed the /bin/bash and tested with dash. All the tests
passed.
I also followed some of the advice found in
https://wiki.ubuntu.com/DashAsBinSh for converting a bash script to be
more portable.
Paul Campbell (3
On Mon, Mar 11, 2013 at 3:24 AM, Junio C Hamano wrote:
> Paul Campbell writes:
>
>> From: Matt Hoffman
>>
>> The repository and branch of a subtree added with the add command is
>> stored in the .gittrees file.
>>
>> Signed-off-by: Paul Campbell
>
From: Matt Hoffman
The repository and branch of a subtree added with the add command is
stored in the .gittrees file.
Signed-off-by: Paul Campbell
---
Rerolled allowing for $IFS whitespace.
contrib/subtree/git-subtree.sh | 8
1 file changed, 8 insertions(+)
diff --git a/contrib
Converts a git-submodule into a git-subtree.
Based-on-patch-by: Peter Jaros
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 37 +++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib
On Mon, Mar 11, 2013 at 3:35 AM, Junio C Hamano wrote:
>> From: bibendi
>>
>> Look in the config file .gittrees for a default repository and
>> refspec or commit when they are not provided on the command line.
>>
>> Uses the .gittrees config file in a similar way to how git-submodule
>> uses the
Hi Mike,
I think git-cvsimport and git-subtree could help you here.
Roughly:
# Create a git version of each SDK_subproj
git cvsimport -r upstream -d $CVSREPO1 $CVSMODULE1 -C SDK_subproj1
git cvsimport -r upstream -d $CVSREPO2 $CVSMODULE2 -C SDK_subproj2
# Create your Working_SDK
git init Workin
f the repo as it
describes where parts of the tree came from and can be used to update
to/from that source.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 42 +-
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/contrib/subtre
tests.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 02aae30..4f21902 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtre
-off-by: Paul Campbell
---
contrib/subtree/t/t7900-subtree.sh | 34 ++
1 file changed, 34 insertions(+)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree/t/t7900-subtree.sh
index bc2eeb0..5ae4584 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b
>From 483a644fb40d14f2209116c45c1cb6beab11a181 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Tue, 12 Feb 2013 00:07:26 +
Subject: [PATCH 4/4] contrib/subtree: update documentation
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 13 +
1 file changed
Remove redundant -n option and raw ^M in call to echo.
Call to 'say' function, a wrapper of 'echo', passed the parameter -n, then
included a raw ^M newline in the end of the last parameter. Yet the -n option
is meant to suppress the addition of new line by echo.
Signed-o
and can be used to update
to and from that source.
Signed-off-by: Paul Campbell
---
Reworked my previous patch paying closer attention to the coding style
documentation and renamed my new functions to make more sense.
contrib/subtree/git-subtree.sh | 75 +++--
add: ensure details are added to .gitsubtree
push: check for a SHA1 update line
pull: add a file on one subtree, push it to a branch, then pull into
another subtree containing the same branch and confirm the files match
add: ensure stale .gitsubtree entry is replaced
Signed-off-by: Paul
Indicate that repository and refspec are now optional on push and pull.
Add notes to add, push and pull about storing values in .gitsubtree
and their use as default values.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 13 +
1 file changed, 9 insertions(+), 4
Hi Jonathan,
On Fri, Feb 15, 2013 at 10:56 PM, Jonathan Nieder wrote:
> Hi Paul,
>
> Paul Campbell wrote:
>
>> --- a/contrib/subtree/t/t7900-subtree.sh
>> +++ b/contrib/subtree/t/t7900-subtree.sh
>> @@ -465,4 +465,34 @@ test_expect_success
On Fri, Feb 15, 2013 at 10:39 PM, Junio C Hamano wrote:
> Paul Campbell writes:
>
>> Remove redundant -n option and raw ^M in call to echo.
>>
>> Call to 'say' function, a wrapper of 'echo', passed the parameter -n, then
>> included a raw ^M ne
On Sun, Feb 17, 2013 at 11:37 AM, Jonathan Nieder wrote:
> Paul Campbell wrote:
>
>> Is there was a better way to verify that the push operation succeeds
>> then grepping for a SHA1?
>
> IIRC then when a push fails, it will exit with nonzero status (so the
> usual &
On Mon, Feb 18, 2013 at 8:20 PM, wrote:
> Paul Campbell writes:
>
>> Subsequent git subtree push/pull operations now default to the values
>> stored in .gitsubtree, unless overridden from the command line.
>>
>> The .gitsubtree file should be tracked as part of the
Thanks to Jonathan for the constructive criticism of the tests. Here
is the latest version.
I suspect I'll need to leave it until after David's changes to the
tests are merged into master, unless anyone thinks I should rebase
elsewhere. I think my tests only need a minor update to accommodate
tho
and can be used to update
to and from that source.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 75 +++---
1 file changed, 64 insertions(+), 11 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
inde
add: ensure details are added to .gitsubtree
push: check for a SHA1 update line
pull: add a file on one subtree, push it to a branch, then pull into
another subtree containing the same branch and confirm the files match
add: ensure stale .gitsubtree entry is replaced
Signed-off-by: Paul
Indicate that repository and refspec are now optional on push and pull.
Add notes to add, push and pull about storing values in .gitsubtree
and their use as default values.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 13 +
1 file changed, 9 insertions(+), 4
Hi,
I'm looking at adding a "git subtree status" command that will tell if
a subtree is up-to-date, ahead of, behind, divergant with or unrelated
to a remote repo.
I just wanted to check that I'm working this out correctly before
writing the code.
1) perform a synthetic subtree split
mine=$(g
On Tue, Feb 26, 2013 at 9:04 AM, Ben McCann wrote:
> I'm fairly new to git and am trying to determine if git subtree would
> be helpful for managing our company's codebase, which has several
> repos some of which depend on each other. All the examples I've seen
> make sense to me as a one-time ope
t exist
locally then the test fails and the remote repo is never contacted.
Removing the tests still works as the git fetch command fails with the
perfectly accurate error:
fatal: Couldn't find remote ref
Signed-off-by: Paul Campbell
---
I must confess to not understanding the comme
On Thu, Feb 28, 2013 at 12:20 AM, Junio C Hamano wrote:
> Paul Campbell writes:
>
>> cmd_add() attempts to check for the validity of refspec for the repository
>> it is about to add as a subtree. It tries to do so before contacting the
>> repository. If the refspec happe
anch for the subtree.
Signed-off-by: Paul Campbell
---
I've rerolled this with alternate tests.
Is there anything else that should be tested for?
contrib/subtree/git-subtree.sh | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/contrib/subtree/git-subtree
On Fri, Mar 1, 2013 at 2:28 AM, Kindjal wrote:
> David Michael Barr rr-dav.id.au> writes:
>
>> From a quick survey, it appears there are no more than 55 patches
>> squashed into the submitted patch.
>> As I have an interest in git-subtree for maintaining the out-of-tree
>> version of vcs-svn/ and
On Sat, Mar 2, 2013 at 11:21 AM, David Michael Barr wrote:
> On Sat, Mar 2, 2013 at 9:05 AM, Paul Campbell wrote:
>> On Fri, Mar 1, 2013 at 2:28 AM, Kindjal wrote:
>>> David Michael Barr rr-dav.id.au> writes:
>>>
>>>> From a quick survey, it
On Sat, Mar 2, 2013 at 5:43 PM, Paul Campbell wrote:
> On Sat, Mar 2, 2013 at 11:21 AM, David Michael Barr wrote:
>> On Sat, Mar 2, 2013 at 9:05 AM, Paul Campbell wrote:
>>> On Fri, Mar 1, 2013 at 2:28 AM, Kindjal wrote:
>>>> David Michael Barr rr-dav.id.au>
On Thu, Mar 7, 2013 at 10:25 AM, Jeremy Rosen wrote:
> Hello everybody
>
>
> I am trying to use git-subtree to follow a subproject but I have a couple of
> problems and I am not sure if I am doing something wrong
>
> Basically I am trying to use a tag on the subproject as my "base" for the
> sub
On Thu, Mar 7, 2013 at 11:05 AM, Jeremy Rosen wrote:
>>
>> Hi Jérémy,
>>
>> Git subtree ignores tags from the remote repo.
>>
>
> is that a design decision or a case of "not implemented yet"
I'm not sure. If you imported all the tags from all your subtrees
repos, you could easily end up with dupl
On Thu, Mar 7, 2013 at 12:50 PM, Jeremy Rosen wrote:
>> >>
>> >> Git subtree ignores tags from the remote repo.
>> >>
>> >
>> > is that a design decision or a case of "not implemented yet"
>>
>> I'm not sure. If you imported all the tags from all your subtrees
>> repos, you could easily end up wit
On Thu, Mar 7, 2013 at 3:15 PM, Jeremy Rosen wrote:
>> >
>> > Ok, I can understand that you don't want to import tags for
>> > namespace reason, but in that case shouldn't
>> > git subtree add refuse to create a subtree when the tag isn't a
>> > commit
>>
>> It shouldn't and tries not to, but is l
The following set of commits are taken from the collection collated by
Herman van Rink and offered to the list in May of last year
($gmane/196667).
Where updating a commit to resolve a conflict has cleared the original
author of the commit I've noted the original author in the commit
message. Thus
>From 72fc84b6e5085b328cc90e664c9f85a1f5cde36c Mon Sep 17 00:00:00 2001
From: Paul Cartwright
Date: Thu, 27 Jan 2011 22:33:06 +0800
Subject: [PATCH 01/19] spell checking
---
contrib/subtree/git-subtree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-su
>From 718c99d167255b28830b6f684d6e6e184fba0f7c Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:30:20 +
Subject: [PATCH 02/19] Add from-submodule. Conflicts: .gitignore
contrib/subtree/git-subtree.sh test.sh
Original-Author: Peter Jaros
Conflicts-resolved
>From 92787322c6e0e8c9166f02f98a71b6e0af9dc405 Mon Sep 17 00:00:00 2001
From: bibendi
Date: Fri, 20 May 2011 00:15:53 +0600
Subject: [PATCH 03/19] Use .gittrees config file like a .gitmodules when pull
or push
---
contrib/subtree/git-subtree.sh | 31 +--
1 file chang
>From 7e20edee694cbcbac79be4fbe37d9cedebe3e4ee Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:31:37 +
Subject: [PATCH 04/19] new commands: pull_all and push_all
Conflicts:
contrib/subtree/git-subtree.sh
Original-Author: bibendi
Conflicts-resolved-by: P
>From 10f2260165d6be3a6ab477ed38fd8ab0308c11e6 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:31:59 +
Subject: [PATCH 05/19] A number of changes to push_all and pull_all:
* adding commands in "add" to populate the .gittrees file
* changing undersco
>From b6c810480547966c73bcaaea4c069fe73dacbc05 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:32:24 +
Subject: [PATCH 06/19] merging change from nresni
manual merge at the moment...i'll try a proper merge next now that
formatting is cleaner
Conflicts:
>From ef4d4081474bd9925b60c2ab856260d9174220b9 Mon Sep 17 00:00:00 2001
From: mhart
Date: Sun, 16 Oct 2011 00:16:53 +1100
Subject: [PATCH 07/19] Added check to ensure that split succeeds before trying
to push
---
contrib/subtree/git-subtree.sh | 7 ++-
1 file changed, 6 insertions(+), 1 del
>From 8f6eb2ddfcaef888dc3d3ea4d089aa2e9cad5d0f Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:32:53 +
Subject: [PATCH 08/19] fixing typo
Conflicts:
git-subtree.sh
Add diff command
Original-Author: mhoffman
Conflicts-resolved-by: Paul Campbell
---
cont
>From ca1c855c032d88159ed878f68ef2e18640bbd49c Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:33:12 +
Subject: [PATCH 09/19] Adding a "list" command
Conflicts:
git-subtree.sh
Original-Author: mhoffman
Conflicts-resolved-by: Paul Campbell
---
co
>From 1aaa55ff64b3b4d9325568b3bb863748f20c80f3 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:33:33 +
Subject: [PATCH 10/19] 'prune' command to clear out stale .gittrees info
Conflicts:
git-subtree.sh
Original-Author: Nate Jones
Conflicts-reso
>From 48e77d62e05582e2aec4c634a913f28f3f804a37 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:33:50 +
Subject: [PATCH 11/19] Add prune command to OPTS_SPEC
Conflicts:
git-subtree.sh
Original-Author: Herman van Rink
Conflicts-resolved-by: Paul Campb
>From d4aa87f53b61481d2f916415f0baec527a8b6417 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:34:10 +
Subject: [PATCH 12/19] Remove trailing slash from prefix parameter
Conflicts:
git-subtree.sh
Original-Author: Herman van Rink
Conflicts-resolved-by: P
>From e1b71e3bf8abaea424972d13ba028b911b07d85a Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:34:31 +
Subject: [PATCH 13/19] from-submodule: add url to .gittrees
Conflicts:
git-subtree.sh
Original-Author: Herman van Rink
Conflicts-resolved-by: Paul Campb
>From 7dcd40ab8687a588b7b0c6ff914a7cfb601b6774 Mon Sep 17 00:00:00 2001
From: Herman van Rink
Date: Tue, 27 Mar 2012 13:59:16 +0200
Subject: [PATCH 14/19] Document pull-all and push-all
---
contrib/subtree/git-subtree.txt | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a
>From 6dc8119a7d99f7107e32f2c5d7ec18b9fd93a6b8 Mon Sep 17 00:00:00 2001
From: Herman van Rink
Date: Tue, 27 Mar 2012 14:14:54 +0200
Subject: [PATCH 15/19] Document from-submodule and prune commands
---
contrib/subtree/git-subtree.txt | 10 ++
1 file changed, 10 insertions(+)
diff --git
>From 6024d877e6c3beebe4c11bd060553d06af422680 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:34:54 +
Subject: [PATCH 16/19] Update SYNOPSIS
Conflicts:
contrib/subtree/git-subtree.txt
Original-Author: Herman van Rink
Conflicts-resolved-by: Paul Campb
>From fed80cb47dffcb805a7808e8574dda44992363b0 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:35:18 +
Subject: [PATCH 17/19] Document list command
Conflicts:
git-subtree.sh
Original-Author: Herman van Rink
Conflicts-resolved-by: Paul Campbell
---
cont
>From ae7c05bdc6d02fa89deabb59cec6150308f227f7 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:35:42 +
Subject: [PATCH 18/19] Added --force option to push
Conflicts:
contrib/subtree/git-subtree.sh
Original-Author: James Roper
Conflicts-resolved-by: P
>From 54d376c3d731ce9e528fe9095ea6c16d382b5ce3 Mon Sep 17 00:00:00 2001
From: Paul Campbell
Date: Sat, 9 Mar 2013 18:36:22 +
Subject: [PATCH 19/19] Fix some trailing whitespace
Conflicts:
contrib/subtree/.gitignore
contrib/subtree/git-subtree.sh
contrib/subt
On Sat, Mar 9, 2013 at 7:45 PM, Junio C Hamano wrote:
> Paul Campbell writes:
>
>> From 72fc84b6e5085b328cc90e664c9f85a1f5cde36c Mon Sep 17 00:00:00 2001
>> From: Paul Cartwright
>> Date: Thu, 27 Jan 2011 22:33:06 +0800
>> Subject: [PATCH 01/19] spell checking
>
isible \r
contrib/subtree: Add command diff
contrib/subtree: Add command list
Michael Hart (1):
contrib/subtree: Teach push to abort if split fails
Nate Jones (1):
contrib/subtree: Add command prune
Paul Campbell (2):
contrib/subtree: Parameters repository/branch for push/pull are
optiona
From: Paul Cartwright
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 7ba853e..e0957ee 100644
--- a/contrib/subtree/git-subtree.txt
+++ b
From: Peter Jaros
Converts a git-submodule into a git-subtree.
Signed-off-by: Paul Campbell
Conflicts:
.gitignore
contrib/subtree/git-subtree.sh
test.sh
---
contrib/subtree/git-subtree.sh | 30 +-
1 file changed, 29 insertions(+), 1
From: Matt Hoffman
The repository and branch of a subtree added with the add command is
stored in the .gittrees file.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 8
1 file changed, 8 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree
From: bibendi
Look in the config file .gittrees for a default repository and
refspec or commit when they are not provided on the command line.
Uses the .gittrees config file in a similar way to how git-submodule
uses the .gitmodules file.
Signed-off-by: Paul Campbell
---
contrib/subtree/git
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
From: Matt Hoffman
Changing underscores to dashes (push_all -> push-all)
Signed-off-by: Paul Campbell
Conflicts:
.gitignore
contrib/subtree/git-subtree.sh
---
contrib/subtree/git-subtree.sh | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --gi
From: Matt Hoffman
Only when a repository and/or branch are not supplied on the command
line will push and pull look for them in the .gittrees file.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 32
1 file changed, 24 insertions(+), 8
comes a CR, yet is not munged by text
editors.
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 98c508b..8056
From: Michael Hart
Added a check to ensure that split succeeds before trying to push.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index
From: Matt Hoffman
Fetches the remote repo as a temporary git-remote then uses
git-diff-tree to do comparison before removing the temporary
git-remote.
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 34 +-
1
From: Matt Hoffman
Lists subtrees from the .gittrees file.
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib
From: Nate Jones
Removes entries in .gittrees where the subtree files are
no longer present on disk.
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/contrib
From: Herman van Rink
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 0c41383..d67fe5a 100755
--- a/contrib/subtree/git
From: Herman van Rink
Conflicts:
git-subtree.sh
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index d67fe5a..ae7d1fe 100755
--- a/contrib/subtree
From: Herman van Rink
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index ae7d1fe..84c90c7 100755
--- a/contrib/subtree
From: Herman van Rink
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index e0957ee..c8fc103 100644
--- a/contrib/subtree/git
From: Herman van Rink
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 10 ++
1 file changed, 10 insertions(+)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index c8fc103..48ba158 100644
--- a/contrib/subtree/git-subtree.txt
+++ b
From: Herman van Rink
Add pull-all, push-all, from-submodule, prune and diff commands
to SYNOPSIS.
Add alternate parameter option for add command.
Use long-form option for specifying prefix.
Signed-off-by: Paul Campbell
Conflicts:
contrib/subtree/git-subtree.txt
---
contrib/subtree
From: Herman van Rink
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 1 +
contrib/subtree/git-subtree.txt | 4
2 files changed, 5 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index
From: James Roper
Signed-off-by: Paul Campbell
Conflicts:
contrib/subtree/git-subtree.sh
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 9 -
contrib/subtree/git-subtree.txt | 5 +
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/contrib
From: Herman van Rink
Signed-off-by: Paul Campbell
Conflicts:
contrib/subtree/.gitignore
contrib/subtree/git-subtree.sh
contrib/subtree/test.sh
---
It's a nasty formatting only patch and I won't be surprised or too
dissappiointed
if this doesn't make
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 263ea9f..aaee6ae 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index aaee6ae..fb6f044 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git
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:
>> contr
On Tue, Mar 12, 2013 at 10:02 AM, Jeremy Rosen wrote:
> Paul, I'm not quite sure where I should go from here...
>
> should I send you a patch so you make it a V3 of your patch ? should I
> send a patch superseeding yours ?
>
> I have also found a similar problem in git-subtree pull, which needs
>
On Tue, Mar 12, 2013 at 3:12 PM, Holger Hellmuth (IKS)
wrote:
> Am 09.03.2013 20:28, schrieb Paul Campbell:
>
>> From 7dcd40ab8687a588b7b0c6ff914a7cfb601b6774 Mon Sep 17 00:00:00 2001
>> From: Herman van Rink
>> Date: Tue, 27 Mar 2012 13:59:16 +0200
>> Subject: [
Less ambitious patch series this time.
James and Michael's patches add if clauses that use the
bashism 'if []' rather than 'if test'. I've left them as
they are to match the other if clauses within the
git-subtree.sh file. I remember reading a comment on the
list about matching the local style bei
From: Michael Hart
If the subtree split fails it doesn't return the SHA that should be
pushed to the other repository.
Added a check to ensure that split succeeds before trying to push
and display an error message.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.s
From: James Roper
Allow the --force option to be passed to the child push command.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 9 -
contrib/subtree/git-subtree.txt | 5 +
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git
From: Paul Cartwright
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 97dd3c9..e1bfa61 100644
--- a/contrib/subtree/git-subtree.txt
+++ b
comes a CR, yet is not munged by text
editors.
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 2d9b071..5314
On Wed, Mar 13, 2013 at 10:32 PM, Paul Campbell wrote:
> From: Matt Hoffman
>
> The ctrl-M (^M) character used for the carriage return (CR) is not visible
> in all (most) text editors and is often silently converted to a new
> line (NL) or CR/NL combo.
>
> 'say&#
comes a CR, yet is not munged by text
editors.
Signed-off-by: Paul Campbell
---
Rerolled with the Conflicts lines removed.
contrib/subtree/git-subtree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 2d9b07
On Fri, Mar 15, 2013 at 12:52 PM, Joydeep Bakshi
wrote:
>
> On 15-Mar-2013, at 6:14 PM, Fredrik Gustafsson wrote:
>
>> On Fri, Mar 15, 2013 at 05:54:05PM +0530, Joydeep Bakshi wrote:
>>> [1] the server will have different git repo with branches
>>> [2] there will be a web-based GUI which must be
On Sat, Mar 16, 2013 at 2:24 AM, Nguyễn Thái Ngọc Duy wrote:
> %>(N,trunc) truncates the righ part after N columns and replace the
> last two letters with "..". ltrunc does the same on the left. mtrunc
> cuts the middle out.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
s/righ/right/
> Documen
97 matches
Mail list logo
