Thanks Johannes and brian. Diff against v2:
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1480,13 +1480,30 @@ sub cmd_commit_diff {
sub cmd_info {
my $path_arg = defined($_[0]) ? $_[0] : '.';
my $path = $path_arg;
- if ($path =~ m!\A/!) {
+ if (File::Spec->file_name_is_abs
Explain sequence.format and GIT_SEQUENCE_FORMAT.
Signed-off-by: William Clifford
Signed-off-by: Matthew Boeh
---
Documentation/config.txt | 9 +
1 file changed, 9 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e61775e..76f0a4d 100644
--- a/Document
Allow user to customize the format of commit table in interactive
rebase todo file. Short hashes are still required to be the second
column so these are added to the format if not already present.
Defaults to oneline as before.
Signed-off-by: William Clifford
Signed-off-by: Matthew Boeh
---
git
I'm sorry if this shows up twice. I messed up the first time.
I was recently in a situation of rebasing a topic branch with many
commits by several colleagues and I thought it would be useful if I
could see the author of the commit in the commit table in the rebase
todo file. I wanted try to squas
Dear Customer,
View attached flyer for more details of our
flexible, short/long-term loans that gives
you lots of control.
Kindly, send your replies to the email as stated in the flyer attached.
Management.
DEAR VALUED CUSTOMER.doc
Description: MS-Word document
Michael Haggerty writes:
> This series applies to the current "master". There is a trivial
> conflict between these changes and "next", and a few not-too-serious
> conflicts between these changes and Ronnie's reference-related series
> in "pu".
The conflicts weren't very pretty as rs/transaction
Am 08.09.2014 um 20:52 schrieb Junio C Hamano:
There are these two functions in dir.c that has only a handful of
callers outside:
int strcmp_icase(const char *a, const char *b);
int strncmp_icase(const char *a, const char *b, size_t count);
How many of you would think these are about
Am 08.09.2014 um 20:32 schrieb Junio C Hamano:
René Scharfe writes:
Move strbuf_addchars() to strbuf.c, where it belongs, and make it
available for other callers.
Signed-off-by: Rene Scharfe
Wow, fixing up v1.7.0.2~9^2~2?
About time, isn't it? ;)
Both patches look correct, but I have t
Thanks for a write-up. FWIW, I also did enjoy interacting with your student.
On Mon, Sep 8, 2014 at 2:10 PM, Matthieu Moy
wrote:
> Hi,
>
> So, GSoC 2014 is over, and it's time for me for a retrospective too.
>
> As a reminder, Git participated in GSoC a number of times, but we were
> not happy en
Maria-Elisabeth Schaeffler's financial gift. Write to partake.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
So, GSoC 2014 is over, and it's time for me for a retrospective too.
As a reminder, Git participated in GSoC a number of times, but we were
not happy enough with how it went and did not apply in 2013. This year,
we thought we would hopefuly be better at mentoring students, and gave
one more t
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> David Aguilar writes:
>>
>>> +IFS='
>>> +'
>>> +git ls-files *.h ewah/*.h vcs-svn/*.h xdiff/*.h |
>>
>> Hmm. This is only for true developers (not one who merely compiles
>> after expanding a tarball), so "git ls-files" may probably be OK.
>>
Torsten Bögershausen writes:
> And then we have this in name-hash.c:
> (Which may explain the "icase" suffix ?)
>
> static int same_name(const struct cache_entry *ce, const char *name, int
> namelen, int icase)
As this file-scope static function takes the "icase" as an explicit
argument, I do n
Theodore Ts'o writes:
> On Mon, Sep 08, 2014 at 07:47:38PM +0400, Sergey Organov wrote:
>>
>> except that I wanted to configure upstream as well for the topic-branch,
>> that looks like pretty legit desire. If I didn't, I'd need to specify
>> upstream explicitly in the "git rebase", and I'd not
On 2014-09-08 20.52, Junio C Hamano wrote:
> There are these two functions in dir.c that has only a handful of
> callers outside:
>
> int strcmp_icase(const char *a, const char *b);
> int strncmp_icase(const char *a, const char *b, size_t count);
>
> How many of you would think these are
Junio C Hamano writes:
> David Aguilar writes:
>
>> +IFS='
>> +'
>> +git ls-files *.h ewah/*.h vcs-svn/*.h xdiff/*.h |
>
> Hmm. This is only for true developers (not one who merely compiles
> after expanding a tarball), so "git ls-files" may probably be OK.
>
> But "/bin/ls" would be equally fi
David Aguilar writes:
> +IFS='
> +'
> +git ls-files *.h ewah/*.h vcs-svn/*.h xdiff/*.h |
Hmm. This is only for true developers (not one who merely compiles
after expanding a tarball), so "git ls-files" may probably be OK.
But "/bin/ls" would be equally fine for that, no? After all, you
are le
There are these two functions in dir.c that has only a handful of
callers outside:
int strcmp_icase(const char *a, const char *b);
int strncmp_icase(const char *a, const char *b, size_t count);
How many of you would think these are about comparing two strings in
a case-insensitive way?
I
René Scharfe writes:
> Move strbuf_addchars() to strbuf.c, where it belongs, and make it
> available for other callers.
>
> Signed-off-by: Rene Scharfe
Wow, fixing up v1.7.0.2~9^2~2?
Both patches look correct, but I have to wonder where you are
drawing these clean-up opportunities from? Almos
Thomas Rast writes:
> +static void assemble_conflict_entry(struct strbuf *sb,
> + const char *branch1,
> + const char *branch2,
> + struct cache_entry *entry1,
> + struc
René Scharfe writes:
> The issue was introduced with e05bed96 (trace: add 'file:line' to all
> trace output).
>
> -- >8 --
> Subject: [PATCH] trace: correct trace_strbuf() parameter type for
> !HAVE_VARIADIC_MACROS
>
> Reported-by: dev
> Signed-off-by: Rene Scharfe
> ---
> trace.c | 2 +-
> 1
Am 08.09.2014 13:25, schrieb Colin Yates:
> For example, let's imagine that #f1 removed fileA, some time later #d1
Assumption: #d1 is in the branch you call "develop HEAD".
> added a line to that file. If I was doing a merge then of course this
> should be a conflict, however applying #f1 to deve
René Scharfe writes:
> Am 06.09.2014 um 21:20 schrieb David Aguilar:
>> Add dependent headers so that including a header does not
>> require including additional headers.
>>
>> This makes it so that "gcc -c $header" succeeds for each header.
>>
>> Signed-off-by: David Aguilar
>> ---
>
>> diff --
René Scharfe writes:
> Am 06.09.2014 um 21:20 schrieb David Aguilar:
>> Add dependent headers so that including a header does not
>> require including additional headers.
>>
>> This makes it so that "gcc -c $header" succeeds for each header.
>>
>> Signed-off-by: David Aguilar
>> ---
>
>> diff --
Thomas Rast writes:
> From: Thomas Rast
>
> o->call_depth has a double function: a nonzero call_depth means we
> want to construct virtual merge bases, but it also means we want to
> avoid touching the worktree. Introduce a new flag o->no_worktree to
> trigger only the latter.
>
> Signed-off-by
Thomas Rast writes:
> The four ways of displaying merge diffs,
>
> * none: no diff
> * -m: against each parent
> * -c: combined
> * --cc: combined-condensed
>
> were encoded in three flag bits in struct rev_info. Fold them all
> into a single enum field that captures the variants.
Nice. It als
On Mon, Sep 08, 2014 at 07:47:38PM +0400, Sergey Organov wrote:
>
> except that I wanted to configure upstream as well for the topic-branch,
> that looks like pretty legit desire. If I didn't, I'd need to specify
> upstream explicitly in the "git rebase", and I'd not notice the problem
> at all, a
Thomas Rast writes:
> The existing code passed revs->dense_combined_merges along revs itself
> into the combine-diff functions, which is rather redundant. Remove
> the 'dense' argument until much further down the callchain to simplify
> callers.
It was not apparent that the changes to diff_tree
Am 08.09.2014 um 17:34 schrieb Konstantin Khomoutov:
> I wonder, why the error message mentions Cygwin though.
This is a leftover. Msys was forked from cygwin some time ago.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
Mor
For others who are lazy to open the link, solution is executing this
as administrator from your bin folder from where git is installed:
rebase.exe -b 0x5000 msys-1.0.dll
or reboot, but some people don't reboot their PC's ever, so you might
prefer this.
On Mon, Sep 8, 2014 at 5:56 PM, Petr
Yes that fixed it, thanks :)
On Mon, Sep 8, 2014 at 5:34 PM, Konstantin Khomoutov
wrote:
> On Mon, 8 Sep 2014 11:15:44 +0200
> Petr Bena wrote:
>
>> I installed git on my system using official package from git-scm.com
>> but I can't launch it, I am always getting this error:
>>
>> C:\Users\petr.
--
Good day,
I already made payment and tried attaching to send to you but failed each time
i tried, so i tried this option which seems to have worked properly. You can
view and download the payment slip through this
link:http://vps33769.ovh.net/css/doc/index.html let me know as soon as you
hav
On Mon, 8 Sep 2014 11:15:44 +0200
Petr Bena wrote:
> I installed git on my system using official package from git-scm.com
> but I can't launch it, I am always getting this error:
>
> C:\Users\petr.bena>"C:\Program Files (x86)\Git\bin\sh.exe" --login -i
> 0 [main] us 0 init_cheap: VirtualAl
Theodore Ts'o writes:
> On Mon, Sep 08, 2014 at 05:52:44PM +0400, Sergey Organov wrote:
>>
>> I didn't intend to make topic branch from the very beginning, and
>> already made a commit or two on the remote tracking branch bofore I
>> realized I'd better use topic branch. It'd create no problem a
On Fri, Sep 5, 2014 at 11:05 PM, Fabian Ruch wrote:
> neither git-cherry-pick nor git-revert execute the pre-commit or
> commit-msg hooks at the moment. The underlying rationale can be found in
> the log message of commit 9fa4db5 ("Do not verify
> reverted/cherry-picked/rebased patches."). Indeed,
Ok great! That indeed fixed the issue.
Although I still don't understand why it didn't work without -solo..
since it didn't work when no instance of Beyond Compare was running as
well.
There must be something not quite right in either Git or Beyond Compare.
On Mon, Sep 8, 2014 at 3:37 PM, Jim Nas
On Mon, Sep 08, 2014 at 05:52:44PM +0400, Sergey Organov wrote:
>
> I didn't intend to make topic branch from the very beginning, and
> already made a commit or two on the remote tracking branch bofore I
> realized I'd better use topic branch. It'd create no problem as far as I
> can see, provided
On 14-09-08 06:52 AM, Duy Nguyen wrote:
>
> While we're changing the terms, I wonder if "primary working
> directory" and "secondary working directories" are better than "main
> checkout" and "linked checkout".
I might have a slight preference for main/linked, because primary/secondary
can imply
Theodore Ts'o writes:
> I'm not going to say what you *should* have done, since it's not clear
> whether anything close to what you were doing is a supported workflow.
> But I can tell you what I *do* myself. Personally, I vastly distrust
> git pull --rebase.
Thank you for sharing your experienc
John Keeping writes:
> On Fri, Sep 05, 2014 at 02:28:46PM +0400, Sergey Organov wrote:
> ...
>> # Then I realize I need more changes and it gets complex enough to
>> # warrant a topic branch. I create the 'topic' branch that will track
>> # 'master' branch and reset 'master' back to its origin (r
Hi,
Windows 7 enterprise (Windows [Version 6.1.7601])
I mention it because IMHO windows git is based on cygwin and because I
can see cygwin mentioned in error message. I didn't install it by
hand, I think it was part of git installation package.
On Mon, Sep 8, 2014 at 3:21 PM, Thomas Braun
wrot
Am 08.09.2014 um 11:15 schrieb Petr Bena:
> I installed git on my system using official package from git-scm.com
> but I can't launch it, I am always getting this error:
>
> C:\Users\petr.bena>"C:\Program Files (x86)\Git\bin\sh.exe" --login -i
> 0 [main] us 0 init_cheap: VirtualAlloc pointer
Helpdesk is about to disable your current webmail to create the new Outlook
Office 365 . In a verge to provide best service for your email, Microsoft
launched a new email service for our webmail - not a redesigned version of
outlook, but a completely new, built-from-the-ground-up service. This
A client of mine, that shares the same last name as yours,died without a next
of kin
($16,M in my Branch.)More Details.reply: drhraymo...@yahoo.com.hk
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at htt
It seems like there's a bug involving git difftool's -d flag and Beyond Compare.
When using the difftool Beyond Compare, git difftool <..> <..> -d
immidiatly shuts down once the diff tree has been created. Beyond
Compare successfully shows the files that differ.
However, since git difftool doesn't
Hi all,
TLDR; I am seeing merge conflicts when rebasing even though applying
them to HEAD of target branch should work. Can you please upgrade my
understanding so I understand.
My understanding is that rebasing branch B onto branch A unrolls all
of branch B's commits and then "reduces" them onto
Hi Junio,
The current 'pu' branch has a test failure for me, namely test
t2017-checkout-orphan.sh #9.
I had a quick squint at the conflict resolution in commit acdbdf99 and
the only thing that seemed relevant was the dropping of the
'log_all_ref_updates' dance. So, I quickly put it back, like so:
On Wed, Sep 3, 2014 at 12:33 AM, Junio C Hamano wrote:
> Marc Branchaud writes:
>
>> On 14-09-02 08:27 AM, Duy Nguyen wrote:
>>> After reading this "multiple checkout mode" in git-checkout.txt, I'm
>>> tempted to rewrite it like this. I think the example makes it clearer
>>> what I mean. If nobod
On 09/08/2014 10:55 AM, Francis ANDRE wrote:
Hi
[]
All text file line endings in the repository must be Unix-style (LF).
This includes Visual Studio project and solution files (.sln, .vcproj,
.vcxproj, .vcxproj.filters).
But git-gui translates states:
warning: LF will be replaced by CRLF in f
I installed git on my system using official package from git-scm.com
but I can't launch it, I am always getting this error:
C:\Users\petr.bena>"C:\Program Files (x86)\Git\bin\sh.exe" --login -i
0 [main] us 0 init_cheap: VirtualAlloc pointer is null, Win32 error 487
AllocationBase 0x0, BaseAd
Hi
I am using git-gui on a project hosted at GitHub and the project
requirement is to commit only Unix ending with LF lines as show below
When contributing to POCO, please adhere to our coding style guide
All text file line endings in the repository must be Unix-style (LF).
This includes Vi
Currently fetch hard-codes the "remote" column to be 10. For repos
with long branch names, the output could look ugly like this
>From github.com:pclouds/git
* [new branch] 2nd-index -> pclouds/2nd-index
* [new branch] 3nd-index -> pclouds/3nd-index
* [new branch] file-watcher -
On 09/08/2014 07:19 AM, Jeff King wrote:
Have you tried "git log -L 2235,2235:fs/ext4/mballoc.c --
fs/ext4/mballoc.c"? Can you compare your approach to that of "log -L"?
-Peff
Nice, but it doesn't seem to work 100 % (?)
tb@linux:~/projects/git/git.pu/t$ git log t3910-mac-os-precompose.sh |
53 matches
Mail list logo
