Thanks a lot, Junio.
It's unclear to me: Are we done with this patch queue, or do I need to
worry about getting these patches into another branch? If the latter,
I'll update patch v5 per your comments.
-Justin
On Mon, Mar 31, 2014 at 4:19 PM, Junio C Hamano wrote:
> Four patches queued on 'pu'
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2
Signed-off-by: Justin Lebar
---
builtin/clean.c | 6 +++---
builtin/commit.c | 2 +-
git-add--interactive.perl | 4 ++--
perl/Git/SVN.pm | 4 ++--
sha1_file.c | 2 +-
t/t1001-read-tree-m-2way.sh | 2 +-
t
Signed-off-by: Justin Lebar
---
contrib/examples/git-commit.sh | 2 +-
contrib/svn-fe/svn-fe.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 23ffb02..4aab1a6 100755
--- a/contrib/examples/git
Signed-off-by: Justin Lebar
---
Documentation/CodingGuidelines | 4 ++--
Documentation/config.txt| 6 +++---
Documentation/diff-generate-patch.txt | 2 +-
Documentation/diff-options.txt | 2 +-
Documentation
Sorry, still figuring out the right workflow here: The subject should
say v4, and it should say patch 3/4.
On Mon, Mar 31, 2014 at 2:04 PM, Justin Lebar wrote:
> Signed-off-by: Justin Lebar
> ---
> Makefile| 2 +-
> bui
Thanks; fixed in v4 (just sent out).
On Mon, Mar 31, 2014 at 12:54 PM, Jason St. John wrote:
> On Sat, Mar 29, 2014 at 6:59 PM, Justin Lebar wrote:
>> This version applies successfully to master, maint, next, and pu. The other
>> patches in the previous version of this queue app
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2
This version applies successfully to master, maint, next, and pu. The other
patches in the previous version of this queue apply successfully without any
changes.
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2
t.
-Justin
On Sat, Mar 22, 2014 at 4:47 PM, Jason St. John wrote:
> On Thu, Mar 20, 2014 at 7:13 PM, Justin Lebar wrote:
>> Thanks for the quick reply.
>>
>> When I send a new patch, should I fold these changes into the original
>> commit, or should I send them as a separ
Thanks for the quick reply.
When I send a new patch, should I fold these changes into the original
commit, or should I send them as a separate commit?
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> index b0d0986..6013e19 100644
>> --- a/builtin/apply.c
>> +++ b/builtin/apply.c
>> @@ -4061,7
Signed-off-by: Justin Lebar
---
builtin/clean.c | 6 +++---
builtin/commit.c | 2 +-
git-add--interactive.perl | 4 ++--
perl/Git/SVN.pm | 4 ++--
sha1_file.c | 2 +-
t/t1001-read-tree-m-2way.sh | 2 +-
t
10n patch (changes will be automatically picked up later).
- Fold the inside-tests and outside-tests patches.
- CC different people, as Duy indicated he wasn't comfortable reviewing.
Justin Lebar (4):
Documentation: Fix misuses of "nor"
contrib: Fix misuses of "nor"
Fix mis
Signed-off-by: Justin Lebar
---
contrib/examples/git-commit.sh | 2 +-
contrib/svn-fe/svn-fe.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 23ffb02..4aab1a6 100755
--- a/contrib/examples/git
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2
Signed-off-by: Justin Lebar
---
Documentation/CodingGuidelines | 4 ++--
Documentation/config.txt| 6 +++---
Documentation/diff-generate-patch.txt | 2 +-
Documentation/diff-options.txt | 2 +-
Documentation
Thanks. I'll remove this patch from the queue.
On Sun, Mar 16, 2014 at 6:45 PM, Jiang Xin wrote:
> 2014-03-15 16:41 GMT+08:00 Justin Lebar :
>> Signed-off-by: Justin Lebar
>> ---
>> po/bg.po| 6 +++---
>> po/de.po| 6 +++---
>> po/fr.po| 6 ++
r I'm not really qualified to review this.
FWIW even being a native English speaker I was unsure about a few of
the changes myself. This caused me to finally break down and order
Garner's Modern American Usage, which I hope will reveal all. :)
-Justin
On Sat, Mar 15, 2014 at 1:56 AM,
Signed-off-by: Justin Lebar
---
builtin/clean.c | 6 +++---
builtin/commit.c | 2 +-
git-add--interactive.perl | 4 ++--
perl/Git/SVN.pm | 4 ++--
sha1_file.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/builtin/clean.c b
Signed-off-by: Justin Lebar
---
t/t1001-read-tree-m-2way.sh | 2 +-
t/t4005-diff-rename-2.sh | 2 +-
t/t4009-diff-rename-4.sh | 2 +-
t/t5304-prune.sh | 2 +-
t/t6036-recursive-corner-cases.sh | 2 +-
t/t7104-reset.sh | 2 +-
t/t9400-git
Signed-off-by: Justin Lebar
---
Documentation/CodingGuidelines | 4 ++--
Documentation/config.txt| 6 +++---
Documentation/diff-generate-patch.txt | 2 +-
Documentation/diff-options.txt | 2 +-
Documentation
Signed-off-by: Justin Lebar
---
po/bg.po| 6 +++---
po/de.po| 6 +++---
po/fr.po| 6 +++---
po/git.pot | 6 +++---
po/it.po| 2 +-
po/pt_PT.po | 2 +-
po/sv.po| 6 +++---
po/vi.po| 6 +++---
po/zh_CN.po | 6 +++---
9 files changed, 23 insertions(+), 23 deletions(-)
diff
Signed-off-by: Justin Lebar
---
contrib/examples/git-commit.sh | 2 +-
contrib/svn-fe/svn-fe.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 23ffb02..4aab1a6 100755
--- a/contrib/examples/git
Signed-off-by: Justin Lebar
---
Makefile| 2 +-
builtin/apply.c | 2 +-
builtin/checkout.c | 2 +-
builtin/log.c | 2 +-
builtin/pack-objects.c | 2
;ve probably made a few fatal errors in how
I packaged this change; apologies in advance.
Justin Lebar (6):
Documentation: Fix misuses of "nor"
contrib: Fix misuses of "nor"
l10n: Fix misuses of "nor"
Fix misuses of "nor" in comments
Fix misuses of
25 matches
Mail list logo