In 2.0rc2, git-gui is unable to work inside submodules, where 1.9.2
did not show such a problem:
yann@home:~$ cd /tmp/
yann@home:tmp$ mkdir foo
yann@home:tmp$ cd foo/
yann@home:foo$ git init
Initialized empty Git repository in /tmp/foo/.git/
yann@home:foo (master)$ git submodule add
to which reflog entry, and --explicit-refs=whatever@{1},whatever@{2} would help
here, as would
something like --explicit-refs=whatever@{*} or --explicit-refs=whatever@{1..5},
but that starts
to be more tricky to formalize.
Thoughts, anyone ?
--
Yann Dirson - Bertin Technologies
--
To unsubscribe
in a way that
appears not to take any option.
Looks like the --help output would gain from having the optional parameter
displayed in the short form...
--
Yann Dirson - Bertin Technologies
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
(patches|REBASE 8/9)$ git rebase --continue
Applying: Check for __unix__ instead of __linux
Applying: Completely disable crash handler on archs other than i386 and amd64
Auto packing the repository for optimum performance. You may also
run git gc manually. See git help gc for more information.
.
Is that due in some way to the semantic differences between the two
revspecs, or is that just a bug ?
--
Yann Dirson - Bertin Technologies
--
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
On Fri, 07 Sep 2012 15:54:49 +0200
Andreas Schwab sch...@linux-m68k.org wrote:
Yann Dirson dir...@bertin.fr writes:
In 1.7.10.3, git rebase -i :/Merge will complain with:
fatal: Needed a single revision
invalid upstream :/Merge
... whereas git rev-parse :/Merge has no problem
Here is a quick test case for a word-diff error, using v1.7.10.4
(debian wheezy package).
Setting up:
tmp$ mkdir foo cd foo
foo$ git init
Initialized empty Git repository in /tmp/foo/.git/
foo (master)$ echo '*.pydiff=python' .gitattributes
foo (master)$ echo 'for name in bar.blurb:'
When I have a couple of stashed changes, it gets annoying to
repeatedly call git stash show -p stash@{N} until finding the
correct one.
Since git reflog show stash already does part of the job, I thought
that adding -p there to see the patch would help (at least it would
show the not-yet-staged
in the
event of a conflict. I suppose that would imply not creating .git/MERGE_MSG in
that
case, but just removing it still causes .git/COMMIT_EDITMSG to be clobbered,
this
time with nothing but the git status-derived comments.
--
Yann Dirson - Bertin Technologies
--
To unsubscribe from this list
it someone wants to do some maintainance, using . as repository
when
the branch to subtree-add is already locally available does not work well either
(fails with could not find ref myremote/myhead).
--
Yann Dirson - Bertin Technologies
--
To unsubscribe from this list: send the line unsubscribe
On Sat, 20 Oct 2012 21:40:03 +0200
Herman van Rink r...@initfour.nl wrote:
On 10/19/2012 03:21 PM, Yann Dirson wrote:
As the examples in git-subtree.txt show, the synopsis in the same file
should
surely get a patch along the lines of:
-'git subtree' add -P prefix commit
+'git
if the shortened sha1's presented
to the user were expanded to full sha1's before starting the rebase.
--
Yann Dirson - Bertin Technologies
--
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
On Tue, 11 Dec 2012 10:15:23 -0800
Junio C Hamano gits...@pobox.com wrote:
Yann Dirson dir...@bertin.fr writes:
There seems to be some bad interactions between git-push and grafts.
The problem seems to occur when a commit that exists in the remote
repo is subject to a graft in the local
On Wed, 12 Dec 2012 09:44:32 +0100 Yann Dirson dir...@bertin.fr wrote:
In fact, I even looked for a way to specify an alternate (or supplementary)
grafts file for this drafting work, so only well-controlled git invocations
would see them, whereas the others would just ignore them, and could
On Wed, 12 Dec 2012 11:57:47 -0800
Junio C Hamano gits...@pobox.com wrote:
Yann Dirson dir...@bertin.fr writes:
In this respect, they seem to be
lacking a few features, when compared to replace refs, but they have
different
uses, ...
Not reallyl; grafts were old hack whose
On Mon, 17 Dec 2012 00:56:06 -0800
Junio C Hamano gits...@pobox.com wrote:
Yann Dirson dir...@bertin.fr writes:
And we may still want the bug fixed, or would we just list it as a known
bug ?
At least it does not seem to occur with replace refs:
The replace was designed to fix known
) { if (/^author/) { print
'$NEWPARENTS'; print; $state=2 } } else { print }')
Well, a short bash script should be more readable and possibly faster, but
that's the
idea. Such a script could be a candidate for contrib ?
--
Yann Dirson - Bertin Technologies
--
To unsubscribe from this list: send the line
On Tue, 18 Dec 2012 08:09:35 -0800
Junio C Hamano gits...@pobox.com wrote:
Yann Dirson dir...@bertin.fr writes:
On Mon, 17 Dec 2012 13:14:56 -0800
Junio C Hamano gits...@pobox.com wrote:
Andreas Schwab sch...@linux-m68k.org writes:
Christian Couder christian.cou...@gmail.com
by the offer to repack. If I decline repacking, then both
dialogs are discarded, and the first one, which is quite critical, may not have
been
seen at all by the user.
--
Yann Dirson - Bertin Technologies
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
0e9b327 ...
--
Yann Dirson - Bertin Technologies
--
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
this a workaround for a suboptimal CLI, but since we don't want
to change the rebase CLI before at least 2.0, that could fill the gap for now.
As for the flag itself, what about --here ? Obviously it would only be
meaninglful together with -i, and be exclusive with --onto.
--
Yann Dirson - Bertin
of cherry-pick, which shows a situation
where we may want to specify a set of single commits and ranges, but for which
the current mechanisms cause a problem.
See: http://thread.gmane.org/gmane.comp.version-control.git/14/focus=200058
--
Yann Dirson - Bertin Technologies
--
To unsubscribe
---
git-reintegrate | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-reintegrate b/git-reintegrate
index a1c17d2..da45239 100755
--- a/git-reintegrate
+++ b/git-reintegrate
@@ -338,7 +338,7 @@ class Integration
def finalize_command(cmd, args, message)
begin
---
git-reintegrate | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-reintegrate b/git-reintegrate
index da45239..a6e3cff 100755
--- a/git-reintegrate
+++ b/git-reintegrate
@@ -581,7 +581,7 @@ def status_merge(branch_to_merge = nil)
elsif system(*%w[git merge-base
24 matches
Mail list logo
