Hi.
On Mon, Jan 13, 2014 at 05:11:41PM -0800, Jonathan Nieder wrote:
> (just cc-ing some area experts)
> Benoît Bourbié wrote:
>> git gui crashes on my Linux machin since I updated it to 1.8.5.2.
I believe this happens at tk8.4 or earlier. I have not
tested it there, and according to the manpages
Hello Jonathan,
Yes, after checking, you are absolutely right, I was on master.
:)
On Mon, Jan 13, 2014 at 7:11 PM, Jonathan Nieder wrote:
> (just cc-ing some area experts)
> Hi Benoît,
>
> Benoît Bourbié wrote:
>
>> git gui crashes on my Linux machin since I updated it to 1.8.5.2.
>
> I assu
We used to use two separate rules for the normal ref resolution
dwimming and dwimming done to decide which remote ref to grab. The
third parameter to refname_match() selected which rules to use.
When these two rules were harmonized in
2011-11-04 dd621df9cd refs DWIMmery: use the same rule fo
The old text made it sound like macros are only allowed in the
.gitattributes file at the top-level of the working tree. Make it
clear that they are also allowed in $GIT_DIR/info/attributes and in
the global and system-wide gitattributes files.
Signed-off-by: Michael Haggerty
---
Documentation/
On Mon, Jan 13, 2014 at 02:13:46PM -0800, Junio C Hamano wrote:
> "W. Trevor King" writes:
>
> > Additional metadata, the initial checkout, and syncing down
> > ---
> >
> > However, folks who do local submodule development will care about
>
Hello!
git-1.8.4.4
The manpage for git-pull mentions -m in a comment:
--edit, -e, --no-edit
Invoke an editor before committing successful mechanical merge to further edit
the auto-generated merge message, so that the user can explain and justify the
merge. The --no-edit option can be used to acc
On Sun, Jan 12, 2014 at 6:03 PM, Nguyễn Thái Ngọc Duy wrote:
> We are running out of on-disk ce_flags,
Correction, we're not. I saw
/*
* Extended on-disk flags
*/
#define CE_INTENT_TO_ADD (1 << 29)
#define CE_SKIP_WORKTREE (1 << 30)
followed by
/* CE_EXTENDED2 is for future extension
On Tue, Jan 14, 2014 at 12:02 AM, Jonathan Nieder wrote:
> Hi,
>
> Nguyễn Thái Ngọc Duy wrote:
>
>> If an entry is "watched", git lets an external program decide if the
>> entry is modified or not. It's more like --assume-unchanged, but
>> designed to be controlled by machine.
>>
>> We are running
(just cc-ing some area experts)
Hi Benoît,
Benoît Bourbié wrote:
> git gui crashes on my Linux machin since I updated it to 1.8.5.2.
I assume you mean "master" and not 1.8.5.2, since v1.8.5.2 doesn't
include the change 918dbf58 (git-gui: right half window is paned,
2013-08-21).
> I had the mess
Junio C Hamano writes:
>> While the result is more consistent and more predictable in the case
>> of merged cherry picks, it is also slower in every case.
>
> Consistent and predictable, perhaps, but I am not sure "exact" would
> be a good word.
Another thing I am not enthusiasitc about this cha
dam...@iwi.me wrote on Mon, 13 Jan 2014 14:37 +0100:
> I am trying to clone a perforce repository via git and I am having the
> following backtrace :
>
> {14:20}~/projects/:master ✗ ➭ git p4 clone //depot/@all .
> Importing revision …
> [...]
> Importing revision 59702 (45%)Traceback (most re
Hello,
git gui crashes on my Linux machin since I updated it to 1.8.5.2.
I had the message
Error in startup script: unknown option "-stretch"
while executing
".vpane.lower paneconfigure .vpane.lower.diff -stretch always"
invoked from within
"if {$use_ttk} {
.vpane.lower pane .vpane.lower.
frrr...@gmail.com wrote on Mon, 13 Jan 2014 12:10 +:
> Hello,
>
> On Sun, Jan 12, 2014 at 05:29:46PM -0500, Pete Wyckoff wrote:
> > Thanks for the patch, but I'm curious how you'd like this to
> > work. I never use the option myself.
> >
> > As it is, --prepare-p4-only generates a file in /t
"Bernhard R. Link" writes:
> * Junio C Hamano [140113 23:31]:
>> I read the updated documentation three times but it still does not
>> answer any of my questions I had in $gmane/239888, the most
>> important part of which was:
>>
>> Yeah, the cherry-picked one will introduce the same change
* Junio C Hamano [140113 23:31]:
> I read the updated documentation three times but it still does not
> answer any of my questions I had in $gmane/239888, the most
> important part of which was:
>
> Yeah, the cherry-picked one will introduce the same change as
> the one that was cherry-pic
"Bernhard R. Link" writes:
> Allows to disable the git blame optimization of assuming that if there is a
> parent of a merge commit that has the exactly same file content, then
> only this parent is to be looked at.
>
> This optimization, while being faster in the usual case, means that in
> the
"W. Trevor King" writes:
> Additional metadata, the initial checkout, and syncing down
> ---
>
> However, folks who do local submodule development will care about
> which submodule commit is responsible for that tree, because that's
> going
Jonathan Nieder writes:
> * More typical usage is to clone from a bare repository (A.git), which
>wouldn't have this problem. But I think your case is worth
>supporting, too.
I think the relative URL among nested submodules was specifically
designed for hosting environments that have f
Hi,
On Mon, Jan 13, 2014 at 11:55:18AM -0800, Jonathan Nieder wrote:
> Lianheng Tong wrote:
>
> > git clone W1:/.git
>
> Interesting.
>
> Thoughts:
>
> * More typical usage is to clone from a bare repository (A.git), which
>wouldn't have this problem. But I think your case is worth
>
On Mon, Jan 13, 2014 at 12:15:08PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > It does not matter for actually pushing, because to do a non-default
> > push, you must always specify a remote. But "@{publish}" will ask the
> > question "even if I am on 'side' now, what would happen if
Jeff King writes:
> It does not matter for actually pushing, because to do a non-default
> push, you must always specify a remote. But "@{publish}" will ask the
> question "even if I am on 'side' now, what would happen if I were to
> default-push on 'master'?".
In a similar wording to yours, it
On Mon, Jan 13, 2014 at 08:37:37PM +0100, Jens Lehmann wrote:
> Am 12.01.2014 02:08, schrieb W. Trevor King:
> > For folks who treat the submodule as a black box (and do no local
> > development), switchable trees are all they care about. They can
> > easily checkout (or not, with deinit), the sub
Hi,
Lianheng Tong wrote:
> git clone W1:/.git
Interesting.
Thoughts:
* More typical usage is to clone from a bare repository (A.git), which
wouldn't have this problem. But I think your case is worth
supporting, too.
* What would you think of putting symlinks in A's .git directory?
Thanks for the writeup, comments below.
Am 12.01.2014 02:08, schrieb W. Trevor King:
> Gitlinked commit hash
> -
>
> The submodule model revolves around links to commits (“gitlinks”):
>
> $ git ls-tree HEAD
> 100644 blob 189fc359d3dc1ed5019b9834b93f0dfb49c5851f.gitmod
On Mon, Jan 13, 2014 at 04:52:52PM +0530, Ramkumar Ramachandra wrote:
> Not sure I understand what the problem is. Let's say we have two
> branches: "master", and "side" with remote.pushdefault = ram,
> branch.*.remote = origin, and branch.side.pushremote = peff. Now, when
> I query master's pushr
Thomas Ackermann writes:
> - Add to Documentation/Makefile
> - Start every TODO with a new line
> - Fix indentation error
>
> Signed-off-by: Thomas Ackermann
> ---
> Documentation/Makefile| 1 +
> Documentation/technical/http-protocol.txt | 3 +--
> 2 files changed, 2 insert
Hello!
I looked through your profile and decided to write you a message to inform you
that i am interested in knowing more about you please you can contact me true
my email so that i can tell you all about me ok
Regards
Miss.
khadymo...@yahoo.com
--
To unsubscribe from
"Jason St. John" writes:
> What AsciiDoc formatter (and version) do you use?
$ asciidoc --version
asciidoc 8.6.8
Checking with www.methods.co.nz/asciidoc, I am behind by about 2
months, it seems, though.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a
Francesco Pretto writes:
> Thanks for the comments, my replies below. Before, a couple of general
> questions:
> - I'm also writing some tests, should I commit them together with the
> feature patch?
> - to determine the attached/detached state I did this:
>
> head_detached=
> if test "$(rev-pars
Hi,
Nguyễn Thái Ngọc Duy wrote:
> If an entry is "watched", git lets an external program decide if the
> entry is modified or not. It's more like --assume-unchanged, but
> designed to be controlled by machine.
>
> We are running out of on-disk ce_flags, so instead of extending
> on-disk entry for
Hi All,
I am currently working on a project, call it A, which contains several
sub-projects B, C, D. The B, C, D are actually experimental input and outputs
for simulation runs, which I need to keep track of the daily changes. Most of
these calculations are done on workstation, but I do need
Hi !
I am trying to clone a perforce repository via git and I am having the
following backtrace :
{14:20}~/projects/:master ✗ ➭ git p4 clone //depot/@all .
Importing revision …
[...]
Importing revision 59702 (45%)Traceback (most recent call last):
File "/opt/git/libexec/git-core/git-p4",
Hello,
On Sun, Jan 12, 2014 at 05:29:46PM -0500, Pete Wyckoff wrote:
> Thanks for the patch, but I'm curious how you'd like this to
> work. I never use the option myself.
>
> As it is, --prepare-p4-only generates a file in /tmp/ that has
> exactly the contents you'd see in the editor during "git
Jeff King wrote:
> 2. If the current branch has a branch.*.pushremote set, but we want to
> know where a _different_ branch would be pushed, we have no way to
> access remote.pushdefault (it gets overwritten in the hunk above).
>
> @{upstream} does not have this problem, because it
On Sun, Jan 12, 2014 at 10:41:06PM +0530, Ramkumar Ramachandra wrote:
> When a caller uses branch_get() to retrieve a "struct branch", they get
> the per-branch remote name and a pointer to the remote struct. However,
> they have no way of knowing about the per-branch pushremote from this
> interf
35 matches
Mail list logo
