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 |
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 -
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
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.benaC:\Program Files (x86)\Git\bin\sh.exe --login -i
0 [main] us 0 init_cheap: VirtualAlloc pointer is null, Win32 error 487
AllocationBase 0x0,
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
On Wed, Sep 3, 2014 at 12:33 AM, Junio C Hamano gits...@pobox.com wrote:
Marc Branchaud marcn...@xiplink.com 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
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
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
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
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
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.
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.benaC:\Program Files (x86)\Git\bin\sh.exe --login -i
0 [main] us 0 init_cheap: VirtualAlloc pointer is
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
John Keeping j...@keeping.me.uk 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
Theodore Ts'o ty...@mit.edu 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
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 that there
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
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
On Fri, Sep 5, 2014 at 11:05 PM, Fabian Ruch baf...@gmail.com 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
Theodore Ts'o ty...@mit.edu 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
On Mon, 8 Sep 2014 11:15:44 +0200
Petr Bena benap...@gmail.com 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.benaC:\Program Files (x86)\Git\bin\sh.exe --login -i
0 [main] us 0
--
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
Yes that fixed it, thanks :)
On Mon, Sep 8, 2014 at 5:34 PM, Konstantin Khomoutov
flatw...@users.sourceforge.net wrote:
On Mon, 8 Sep 2014 11:15:44 +0200
Petr Bena benap...@gmail.com wrote:
I installed git on my system using official package from git-scm.com
but I can't launch it, I am
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,
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
More
Thomas Rast t...@thomasrast.ch 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
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, as the
Thomas Rast t...@thomasrast.ch writes:
From: Thomas Rast tr...@inf.ethz.ch
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
René Scharfe l@web.de 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 dav...@gmail.com
---
René Scharfe l@web.de 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 dav...@gmail.com
---
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 develop
René Scharfe l@web.de 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 d...@cor0.com
Signed-off-by: Rene Scharfe l@web.de
Thomas Rast t...@thomasrast.ch writes:
+static void assemble_conflict_entry(struct strbuf *sb,
+ const char *branch1,
+ const char *branch2,
+ struct cache_entry *entry1,
+
René Scharfe l@web.de writes:
Move strbuf_addchars() to strbuf.c, where it belongs, and make it
available for other callers.
Signed-off-by: Rene Scharfe l@web.de
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
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?
David Aguilar dav...@gmail.com 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,
Junio C Hamano gits...@pobox.com writes:
David Aguilar dav...@gmail.com 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
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 about
Theodore Ts'o ty...@mit.edu 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
Torsten Bögershausen tbo...@web.de 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
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
David Aguilar dav...@gmail.com 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),
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
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
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
matthieu@grenoble-inp.fr 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,
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 l@web.de writes:
Move strbuf_addchars() to strbuf.c, where it belongs, and make it
available for other callers.
Signed-off-by: Rene Scharfe l@web.de
Wow, fixing up v1.7.0.2~9^2~2?
About time, isn't it? ;)
Both patches
Michael Haggerty mhag...@alum.mit.edu 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
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
48 matches
Mail list logo
