Hello Junio,
On Sat, Oct 24, 2015 at 12:41 AM, Junio C Hamano <gits...@pobox.com> wrote:
> Francis Moreau <francis.m...@gmail.com> writes:
>
>> I was mislead by the git-cherry manpage somehow which says:
>>
>> "git-cherry therefore
>> d
Hi,
I have a simple merge conflict use case:
$ mkdir foo
$ cd foo/
$ git init
$ echo line1 > a
$ git add .
$ git commit -q -m init
$ echo line2 >>a
$ git commit -a -q -m "add line2"
$ git checkout -b foo HEAD~1
$ git cherry-pick -x master
$ echo line3 >>a
$ git stage a
$ git commit -q -m "add
On Fri, Oct 23, 2015 at 12:57 PM, Kevin Daudt <m...@ikke.info> wrote:
> On Tue, Oct 20, 2015 at 06:32:12PM +0200, Francis Moreau wrote:
>> Hi,
>>
>> I'm seeing something odd with git-cherry: it doesn't seem to detect
>> that a commit has been cherry-picked from
Hi,
On Tue, Oct 20, 2015 at 6:32 PM, Francis Moreau <francis.m...@gmail.com> wrote:
> Hi,
>
> I'm seeing something odd with git-cherry: it doesn't seem to detect
> that a commit has been cherry-picked from master branch.
>
> This happens with the systemd git rep
Hi,
I'm seeing something odd with git-cherry: it doesn't seem to detect
that a commit has been cherry-picked from master branch.
This happens with the systemd git repository (from github) so it
should be fairly simple to reproduce.
What I did:
$ git --version
git version 2.6.0
$ git checkout
Hi,
I have several "maintainance" branches which are based on
different version of my software, which contains only fixes,
imported with 'git cherry-pick'.
I use to comparing stable branches to see if one of them is not
missing a fix for instance. For that purpose I use "git cherry"
of "git log
Hi,
I have a suspect case which happens when rebasing a branch.
I'm using the post-rewrite hook and during certain circumstance, my hook
is called by git-rebase with wrong parameters: old-sha1 argument is
not related to new-sha1 one.
This actually happens when git-rebase stops and reports:
oops, I forgot to say that this happen with git 2.3.1.
On 03/05/2015 02:55 PM, Francis Moreau wrote:
Hi,
I have a suspect case which happens when rebasing a branch.
I'm using the post-rewrite hook and during certain circumstance, my hook
is called by git-rebase with wrong parameters: old
Hi,
On 03/02/2015 02:08 PM, Michael J Gruber wrote:
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-remote.txt | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index
Hi,
git remote add has --no-tags/--tags option, but I can't find in the man
page which one is the default.
Could anybody tell me the default option ?
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
On 01/15/2014 10:49 AM, Jeff King wrote:
[+cc Junio, as the bug blames to him]
On Fri, Jan 10, 2014 at 02:15:40PM +0100, Francis Moreau wrote:
In mykernel repository, I'm having 2 different behaviours with git-log
but I don't understand why:
Doing:
$ git log --oneline --cherry-pick
Hello,
In mykernel repository, I'm having 2 different behaviours with git-log
but I don't understand why:
Doing:
$ git log --oneline --cherry-pick --left-right v3.4.71-1^{}...next
and
$ git log --oneline --cherry-pick --left-right v3.4.71-1...next
give something different (where
Hello,
I'd like to get a similar rewritten list than the one that git-rebase
pass to the post-rewrite hook.
Is there any ways to do that without using the post-rewrite hook ?
Thanks
--
Francis
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Hello,
Basically doing: git describe --abbrev=0 sha1 gives the closest tag
from sha1
I would expect adding --contains option would give the closest tag
containing sha1 but it seems that --abbrev=0 has no more effect in
that case:
$ git describe --tags --contains --abbrev=0
On Fri, Sep 27, 2013 at 10:11 AM, John Keeping j...@keeping.me.uk wrote:
On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote:
Hi,
On Thu, Sep 26, 2013 at 10:21 PM, John Keeping j...@keeping.me.uk wrote:
On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote:
I'm trying
On Fri, Sep 27, 2013 at 11:14 AM, John Keeping j...@keeping.me.uk wrote:
On Fri, Sep 27, 2013 at 10:28:05AM +0200, Francis Moreau wrote:
On Fri, Sep 27, 2013 at 10:11 AM, John Keeping j...@keeping.me.uk wrote:
On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote:
Hi,
On Thu
Hello,
When using --cherry option (which implies --cherry-mark) the mark
boundaries are +, -, = when revs are displayed.
But if I'm displaying them with --format=format:%m %H, it's still
using , , = instead.
Is that expected ?
Thanks
--
Francis
--
To unsubscribe from this list: send the line
Hello,
I'm trying to use git log --cherry ... in order to display new, kept
and removed commits between two branches A and B.
So commits which are only in B are considered new and should be marked
with '+'. Commits which are in both branches are marked with '=' but
only commit in branch B are
Hi,
On Thu, Sep 26, 2013 at 10:21 PM, John Keeping j...@keeping.me.uk wrote:
On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote:
I'm trying to use git log --cherry ... in order to display new, kept
and removed commits between two branches A and B.
So commits which are only in B
On Fri, Sep 20, 2013 at 12:34 PM, Jeff King p...@peff.net wrote:
On Fri, Sep 20, 2013 at 07:38:17AM +0200, Francis Moreau wrote:
I'm using notes in my project. I'm wondering if it's possible to save
the state of the notes when I'm releasing/tagging a new version of my
project so I can restore
Hello,
I'm using notes in my project. I'm wondering if it's possible to save
the state of the notes when I'm releasing/tagging a new version of my
project so I can restore the saved notes state if I checkout back the
old release.
Therefore I would be able to inspect notes (which may have been
Hello,
I'd like to know if that's possible to parse all notes to detect a
special string and if it's the case, remove the note like git-notes
remove would do.
Thanks
--
Francis
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
On Fri, Sep 13, 2013 at 10:12 AM, Johan Herland jo...@herland.net wrote:
On Fri, Sep 13, 2013 at 8:51 AM, Francis Moreau francis.m...@gmail.com
wrote:
Hello,
I'd like to know if that's possible to parse all notes to detect a
special string and if it's the case, remove the note like git
Hello,
When rebasing a branch which contains commits with notes onto another
branch it happens that some commits are already presents in the target
branch.
In that case git-rebase correctly drops those (already present)
commits but it also drops the notes associated with them.
Can the notes be
On Wed, Sep 4, 2013 at 10:28 AM, Jeff King p...@peff.net wrote:
On Wed, Sep 04, 2013 at 08:59:41AM +0100, John Keeping wrote:
On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote:
On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote:
When rebasing a branch which contains
Hello,
On Mon, Aug 19, 2013 at 3:55 PM, Johan Herland jo...@herland.net wrote:
On Mon, Aug 19, 2013 at 10:13 AM, Francis Moreau francis.m...@gmail.com
wrote:
Hello,
Is it possible to keep submodules notes in the super project ?
Not easily. I guess it depends on what you want to use
Hello,
Is it possible to keep submodules notes in the super project ?
Thanks
--
Francis
--
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
Hello Thomas,
On Mon, Jun 24, 2013 at 11:59 AM, Thomas Rast tr...@inf.ethz.ch wrote:
Francis Moreau francis.m...@gmail.com writes:
On Thu, Jun 20, 2013 at 3:20 PM, Thomas Rast tr...@inf.ethz.ch wrote:
positive=$(git rev-parse $@ | grep -v '^\^')
negative=$(git rev-parse $@ | grep
Hi,
On Thu, Jun 20, 2013 at 3:47 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Francis Moreau wrote:
Basically I have an initial set (or can be several different sets)
expressed as a revision specification described by git-rev-list man
page. I just want to find the common set of commit
Hello,
I'd like to write a script that would parse commits in one of my repo.
Ideally this script should accept any revision ranges that
git-rev-list would accept.
This script should consider commits in master differently than the
ones in others branches.
To get the commit set which can't be
On Thu, Jun 20, 2013 at 1:26 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Francis Moreau wrote:
To get the commit set which can't be reached by master (ie commits
which are specific to branches other than master) I would do:
# $@ is the range spec passed to the script
git rev-list
Hi,
On Thu, Jun 20, 2013 at 3:04 PM, Phil Hord phil.h...@gmail.com wrote:
On Thu, Jun 20, 2013 at 6:14 AM, Francis Moreau francis.m...@gmail.com
wrote:
I'd like to write a script that would parse commits in one of my repo.
Ideally this script should accept any revision ranges that
git-rev
Hi,
On Thu, Jun 20, 2013 at 3:20 PM, Thomas Rast tr...@inf.ethz.ch wrote:
Francis Moreau francis.m...@gmail.com writes:
But I'm wondering if someone can see another solution more elegant ?
I think there's a cute way. Suppose your arguments are of the form
Really nice !
p1 p2
Hello,
Would it make sense to add the option --ignore-submodules (currently
available in git-status) to git-describe when the later is used with
--dirty option ?
Thanks
--
Francis
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Mon, Nov 19, 2012 at 8:36 PM, Junio C Hamano gits...@pobox.com wrote:
Francis Moreau francis.m...@gmail.com writes:
Inside the kernel repository, I tried this:
$ git describe --dirty --match 'v[0-9]*' --abbrev=4 HEAD
fatal: --dirty is incompatible with committishes
If 'HEAD' is removed
Hi,
On Tue, Oct 30, 2012 at 12:09 PM, Tomas Carnecky
tomas.carne...@gmail.com wrote:
On Tue, 30 Oct 2012 11:53:08 +0100, Francis Moreau francis.m...@gmail.com
wrote:
Hi,
I'm using git-commit with the --template option. The template I'm
given is self sufficient for my purpose but as stated
On Sun, Oct 28, 2012 at 1:02 AM, Jens Lehmann jens.lehm...@web.de wrote:
Am 26.10.2012 22:43, schrieb Francis Moreau:
On Fri, Oct 26, 2012 at 10:05 PM, Jens Lehmann jens.lehm...@web.de wrote:
[...]
That is weird, git diff --submodule should show that too. Is there
anything unusual about your
Hi,
it seems to me that when passed an unknown rev or a wrong commit/sha1,
git-submodule-summary should at least exit with an error status. Even better
would be a error output.
Test was done with git version 1.7.10.4 from debian wheezy.
Thanks
--
Francis
--
To unsubscribe from this list: send
Hi,
Thanks for answering
On Fri, Oct 26, 2012 at 9:08 PM, Jens Lehmann jens.lehm...@web.de wrote:
Am 26.10.2012 16:07, schrieb Francis Moreau:
I'm trying to use the --submodule switch with git-diff but doesnt
understand the following behaviour:
$ git diff
On Fri, Oct 26, 2012 at 9:53 PM, Jens Lehmann jens.lehm...@web.de wrote:
Am 26.10.2012 16:03, schrieb Francis Moreau:
it seems to me that when passed an unknown rev or a wrong commit/sha1,
git-submodule-summary should at least exit with an error status. Even better
would be a error output
On Fri, Oct 26, 2012 at 10:05 PM, Jens Lehmann jens.lehm...@web.de wrote:
[...]
That is weird, git diff --submodule should show that too. Is there
anything unusual about your setup? (The only explanation I can come
up with after checking the code is that your submodule has neither a
.git
41 matches
Mail list logo
