[git-users] I don't know how to from rej file to adjust the source
#cat recipes-devtools/python/python-heat_git.bb.rej
diff
a/meta-openstack/recipes-devtools/python/python-heat_git.bbb/meta-openstack/recipes-devtools/python/
python-heat_git.bb(rejected hunks)
@@ -10,6 +10,9 @@ SRCNAME = "heat"
SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
file://heat.conf \
file://heat.init \
+ file://autoscaling_example.template \
+ file://one_vm_example.template \
+ file://two_vms_example.template \
"
SRCREV="ff6901141fbbc0a13604491aaba01a60487d6f6d"
#cat recipes-devtools/python/python-heat_git.bb
..
PR = "r0"
SRCNAME = "heat"
SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
file://heat.conf \
file://heat.init \
"
SRCREV="58de9e6415f5bdabde708c8584b21b59b7e96a88"
PV="2013.2.3+git${SRCPV}"
S = "${WORKDIR}/git"
.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Re: [git-users] I don't know how to from rej file to adjust the source
Hi Konstantin,
It's a .ref file, I don't know where the conflict comes from, and how to
adjust the file to remove this conflict, in other words. I don't understand
the rej file mean to me
Lei
On Fri, May 16, 2014 at 6:07 PM, Konstantin Khomoutov <
flatw...@users.sourceforge.net> wrote:
> On Fri, 16 May 2014 17:21:10 +0800
> lei yang wrote:
>
> > #cat recipes-devtools/python/python-heat_git.bb.rej
> > diff
> >
> a/meta-openstack/recipes-devtools/python/python-heat_git.bbb/meta-openstack/recipes-devtools/python/
> > python-heat_git.bb(rejected hunks) @@ -10,6 +10,9 @@ SRCNAME =
> > "heat" SRC_URI =
> > "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
> > file://heat.conf \ file://heat.init \
> > + file://autoscaling_example.template \
> > + file://one_vm_example.template \
> > + file://two_vms_example.template \
> > "
> >
> > SRCREV="ff6901141fbbc0a13604491aaba01a60487d6f6d"
>
> It's just a patch file in the so-called unified diff format [1].
> To apply it, use the `patch` program.
> If you need to apply it to the work tree of a Git repository,
> use `git apply` (`git am` might also work).
>
> 1. http://en.wikipedia.org/wiki/Diff#Unified_format
>
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
[git-users] two tree alias ?
Hi expert, I have two tree git://xx-git.ws.com/git/layers/A (nothing contains,just init) git://xx-git.ws.com/git/layers/B (lots of content) for now I want to realize this, when I clone A,it actually clone B? can we create a alias? Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] how to --since and --until get the expected git log
lyang001@lyang001-OptiPlex-9010:~/stats/gitstats$ git log --pretty=format:'%ad %an' --date=short --since='2013-1-25' --until='2013-11-03' 2013-09-22 Alexander Strasser 2013-07-29 Heikki Hokkanen 2012-12-16 Andrey Devyatkin 2013-07-26 Heikki Hokkanen 2013-07-23 Heikki Hokkanen 2013-07-23 Stephen Gordon 2012-08-26 Sven van Haastregt-> this is not what I wanted 2013-02-24 Heikki Hokkanen 2013-02-24 Heikki Hokkanen 2013-01-28 Ernesto Jiménez But I want to get the time only between '2013-1-25' and '2013-11-03', Is there a general way to remove them since I have may of this kind of unexpected results Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Test
-- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] help me about the branch creation time
Hi experts I want to know the branch creation time, any help ( I don't have master branch) Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] about git format-patch help
In my tree from git log I can see the last commit commit 1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6 Author: Mathieu Desnoyers Date: Fri Sep 3 08:08:18 2010 -0400 LTTng modularization, import of lttng 0.226 Will match kernel tree "lttng 0.227". Signed-off-by: Mathieu Desnoyers to get the patch I run lyang0@lyang0-OptiPlex-755:~/git/lttng-modules$ git format-patch 1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6^..1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6 fatal: ambiguous argument '1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6^..1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6': unknown revision or path not in the working tree. Use '--' to separate paths from revisions for other commit it works fine lyang0@lyang0-OptiPlex-755:~/git/lttng-modules$ git format-patch f277b4c1b33341d2e687a614739778084de370d4^..f277b4c1b33341d2e687a614739778084de370d4 0001-Support-architectures-without-dump-tables.patch To reproduce it you can run git clone git://git.lttng.org/lttng-modules.git git format-patch 1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6^..1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6 Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/k16YWOs_hesJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] about git format-patch help
On Wed, Jun 13, 2012 at 11:25 PM, Konstantin Khomoutov wrote: > On Wed, 13 Jun 2012 02:32:25 -0700 (PDT) > lei yang wrote: > >> In my tree from git log I can see the last commit >> >> commit 1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6 >> Author: Mathieu Desnoyers >> Date: Fri Sep 3 08:08:18 2010 -0400 >> >> LTTng modularization, import of lttng 0.226 >> >> Will match kernel tree "lttng 0.227". >> >> Signed-off-by: Mathieu Desnoyers >> >> to get the patch I run >> >> lyang0@lyang0-OptiPlex-755:~/git/lttng-modules$ git format-patch >> 1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6^..1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6 >> fatal: ambiguous argument >> '1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6^..1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6': >> unknown revision or path not in the working tree. >> Use '--' to separate paths from revisions > [...] > > I think you'd better post this to the main Git list > (git at vger.kernel.org, you can subscribe to it at [1]) as this might > indicate a bug. > > To try to solve the problem at hand: does > > git format-patch -1 1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6 > > work for you? it did create a patch, but I dump this patch with nothing, git show 1c8284ebdbd119314b8f01e442e64cf5fd4b9fe6 is not null Lei > According to the docs, this has to export the changeset of just the > single indicated commit. > > 1. http://vger.kernel.org/vger-lists.html -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] how to change the whole git tree to the patchsets
Hi list I want to change my whole tree to the patchset? which cmd can be used ? Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] how to change the whole git tree to the patchsets
On Thu, Jun 14, 2012 at 1:52 AM, Konstantin Khomoutov wrote: > On Thu, 14 Jun 2012 01:03:27 +0800 > lei yang wrote: > >> I want to change my whole tree to the patchset? which cmd can be >> used ? > > git format-patch --root > Thanks This works well, I know it can extract the file with patchsets with git format-patch --root xx.c how could I change the multi-file to pathsets? eg: xx.c xx.h yy.c Lei > Did you RTFM? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] how to get the commit id from one file or multi file
Hi List, Can we get the commit id list for one file or multifile? Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] how to get the commit id from one file or multi file
On Thu, Jun 14, 2012 at 11:46 PM, Bryce Verdier wrote: > On 06/14/2012 08:33 AM, lei yang wrote: >> >> Hi List, >> >> Can we get the commit id list for one file or multifile? >> >> Lei >> > What do you mean by commit id? > I mean the file in git tree has lots of commit, I want to get the commit list for this file Lei > In trying to save time I'm going to take a guess and then try to answer > based on that assumption. There is a command called git-blame. You can use > that to see which person made a change to a particular file. > > Hope that helps. > > Bryce > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To post to this group, send email to git-users@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] how to get the formated patches from the merge id
Hello list: eg: commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429 Merge: b724cc1 51bfd29 how can I from 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the formated patch ? (I know we can do git format-patch b724cc1..51bfd29, but how to from 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get?) Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] how to diff specifc file for different tags or branch
Hi list As the title, if I have two branch A and B, how could I diff the file test.c for A and B Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: how to get the formated patches from the merge id
Hi I mean, I have a commit like below commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429 Merge: b724cc1 51bfd29 This commit done this work: merge b724cc1..51bfd29 commit, The question is how could I *onlys* through 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the formated patch for the commit(b724cc1..51bfd29) Lei On Fri, Jun 15, 2012 at 4:02 PM, Thomas Ferris Nicolaisen wrote: > I don't really understand what you're trying to do here. Could you try > explaining in a little more detail? > > > On Thursday, June 14, 2012 6:25:12 PM UTC+2, lei yang wrote: >> >> Hello list: >> >> eg: >> >> commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429 >> Merge: b724cc1 51bfd29 >> >> how can I from 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the >> formated patch ? >> (I know we can do git format-patch b724cc1..51bfd29, but how to from >> 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get?) >> >> Lei > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To view this discussion on the web visit > https://groups.google.com/d/msg/git-users/-/kVcX-TK_VowJ. > To post to this group, send email to git-users@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: how to get the formated patches from the merge id
On Fri, Jun 15, 2012 at 7:59 PM, Vincent van Ravesteijn wrote: > Op 15-6-2012 13:46, lei yang schreef: > >> Hi >> >> I mean, >> >> I have a commit like below >> commit 0e93b4b304ae052ba1bc73f6d34a68556fe93429 >> Merge: b724cc1 51bfd29 >> >> This commit done this work: merge b724cc1..51bfd29 commit, >> >> The question is how could I *onlys* through >> 0e93b4b304ae052ba1bc73f6d34a68556fe93429 to get the formated patch for >> the >> commit(b724cc1..51bfd29) > > > It is still not clear what you want to accomplish. > > Your proposal: "git format-patch b724cc1..51bfd29" only gives you the > commits that were in the branch 51bfd29 that weren't yet in the branch > b724cc1. This just reflect the commits of one of the branches, but not the > "work done by the merge commit". > but,git format-patch b724cc1..51bfd29 do the same work as what you said "git format-patch 0e93b4b3^1..0e93b4b3^2" so this do the same thing, formated patch which merged, can you give a try to explain it in your workspace. and I don't understand what you said "branch 51bfd29",51bfd29 is not the branch Thanks for your help,git format-patch 0e93b4b3^1..0e93b4b3^2 is what I need. Lei > If this is really what you want you can do: > > $ git format-patch 0e93b4b3^1..0e93b4b3^2 > > 0e93b4b3^1 means the first parent of 0e93b4b3, which is b724cc1. 0e93b4b3^2 > means the second parent, which is 51bfd29 > > HTH, > > Vincent -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] How to see the which file changead between two commit and plus with commit id
Hello I know below command can get which file changed between the two commit lyang0@lyang0-OptiPlex-755:~/git/kernel-3.4.x$ git diff --name-only 16d815fd230b81d49d395e91b084f0731ea6e4a2^..3e5f29bd22e597d66d9c1013a0ab190e6b48a8ba drivers/i2c/busses/i2c-davinci.c drivers/i2c/busses/i2c-tegra.c can we show the info with which commit changed the file ? Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] How to add the branch from another tree to my local branch
As the title, thanks in advance Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] The commit share
Hi expert, With git merge-base I get the commitid1 for the merge base . How could I get the shared commit id since the commitid1 for the two branch? Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: How to add the branch from another tree to my local branch
On Friday, July 6, 2012, Konstantin Khomoutov wrote: > On Fri, 6 Jul 2012 20:34:34 +0800 > lei yang > wrote: > > > As the title, thanks in advance > Please try to rephrase as it appears you're using wrong terminology. > > A tree is a collection of files. For instance, each commit refers to a > tree which captures the state of files that commit refers to. > Hence the statement "a branch from another tree" has no sence: trees do > not have branches, repositories do. > So did you mean branch instead? > > Next, what do you mean by using the "add ... branch .. to ... branch" > statement? You can't "add" two branches, this has no sense. > Did you mean merging? Or what? > > I can try to guess you wanted one of these: > 1) Make a certain branch from a certain (remote) repository to appear in >your local repository. Yes this one,make the branch from remote to be as my local branch > 2) Merge a certain branch from a certain (remote) repository with one >of the branches in your local repository? > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: The commit share
I'm on the train with my phone,tomrrow I would give you example. On Friday, July 6, 2012, Thomas Ferris Nicolaisen wrote: > Hi, > > Could you explain what you mean with "*the shared commit id since the > commitid1 for the two branch*"? Perhaps provide an example? > > On Friday, July 6, 2012 2:39:44 PM UTC+2, lei yang wrote: >> >> Hi expert, >> >> With git merge-base I get the commitid1 for the merge base . How could I >> get the shared commit id since the commitid1 for the two branch? >> >> Thanks >> Lei >> > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To view this discussion on the web visit > https://groups.google.com/d/msg/git-users/-/ZxRa-Ga7v_cJ. > To post to this group, send email to > git-users@googlegroups.com 'git-users@googlegroups.com');> > . > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com 'git-users%2bunsubscr...@googlegroups.com');>. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] how to know which file changed since one commit?
Hi Experts, I want to know which file is changed sine one commit, how could I do? Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: The commit share
I think I should reprase my question in another thread, the quesion is more complicated now Lei On 7/6/12, Thomas Ferris Nicolaisen wrote: > Hi, > > Could you explain what you mean with "*the shared commit id since the > commitid1 for the two branch*"? Perhaps provide an example? > > On Friday, July 6, 2012 2:39:44 PM UTC+2, lei yang wrote: >> >> Hi expert, >> >> With git merge-base I get the commitid1 for the merge base . How could I >> get the shared commit id since the commitid1 for the two branch? >> >> Thanks >> Lei >> > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To view this discussion on the web visit > https://groups.google.com/d/msg/git-users/-/ZxRa-Ga7v_cJ. > To post to this group, send email to git-users@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] the issue I met when I want to back port some thing from one directory
Hi expert, I often get the commit in the branch "upmaster" but not in the "local_branch" for one dir named meta/recipes-core/eglibc with below cmd git rev-list ^local_branch upmaster meta/recipes-core/eglibc and then get the commit list. and then format the commit with patches and then patch to "local_branch" But, today I find some commit even in the branch "upmaster" not in then "local_branch" but with this commit formated patches patch to "local_branch" failed eg: in the "upmaster" it has the commit 447d77b9e33a68f748c96a152eae19148e43ed7c not in the branch "local_branch" (this get from above cmd) upmaster's branch: commit 447d77b9e33a68f748c96a152eae19148e43ed7c Author: Saul Wold Date: Thu Apr 19 11:01:15 2012 -0700 binutils: add embedspu for ppc builds WARNING: For recipe binutils, the following files/directories were installed but not shipped in any package: WARNING: /usr/bin/embedspu Signed-off-by: Saul Wold how ever when I format this commit with patches it pacth failed to local_branch, the reson is local branch has patched with this commit's changes but with another commit id loca_branch: commit 15c8ea4d35edbcaf03c94aba06ded85851679157 Author: Saul Wold Date: Thu Apr 19 11:01:15 2012 -0700 binutils: add embedspu for ppc builds WARNING: For recipe binutils, the following files/directories were installed but not shipped in any package: WARNING: /usr/bin/embedspu Signed-off-by: Saul Wold they have the same content but different commit id how chould I avoid this duplicate patches ( to get a list not duplicate) Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: the issue I met when I want to back port some thing from one directory
The goal is back port the patches to denzil branch from master 1)git://git.openembedded.org/openembedded-core 2)git checkout -b denizl origin/denizl 3)get the commit list in branch master but not in the denzil (to format patches then apply to denzil branch_ [lyang0@ala-lpggp2 openembedded-core]$ git rev-list ^denzil master meta/recipes-devtools/binutils 81ecc9d468c36b36c4b2ccc4ab5f366611a8fa46 f4ed063e32f064e996a4c29760fa4ac49f1ed73c 7b1caeca8e5c0dd066bb940fe6d2dff4d22bf816 f0ad3c8ce298ca492938e4ded2263c54213786f6 29916bfbbea3bb785e8e4d332848b19ebc0a3ea9 99f859612e16d636702f9bb11825259d90e468f2 447d77b9e33a68f748c96a152eae19148e43ed7c and then I can format above commit id with "git format-patch" to get patches but when I patch with the patches I find it patch failed due to commit "447d77b9e33a68f748c96a152eae19148e43ed7c" content has been in the denizl branch even denzil has no commit"447d77b9e33a68f748c96a152eae19148e43ed7c" ,I find the root casues is denizl has the commit "15c8ea4d35edbcaf03c94aba06ded85851679157" which is the same as "447d77b9e33a68f748c96a152eae19148e43ed7c" in master branch My quesion is how could I get the commit list that has not the duplicated content Thanks Lei On 7/7/12, Thomas Ferris Nicolaisen wrote: > On Saturday, July 7, 2012 3:52:05 PM UTC+2, lei yang wrote: >> >> Hi expert, >> >> I often get the commit in the branch "upmaster" but not in the >> "local_branch" for one dir named meta/recipes-core/eglibc with below >> cmd >> >> git rev-list ^local_branch upmaster meta/recipes-core/eglibc >> >> and then get the commit list. and then format the commit with patches >> and then patch to "local_branch" >> >> But, today I find some commit even in the branch "upmaster" not in >> then "local_branch" but with this commit formated patches patch to >> "local_branch" failed >> >> eg: >> in the "upmaster" it has the commit >> 447d77b9e33a68f748c96a152eae19148e43ed7c >> not in the branch "local_branch" (this get from above cmd) >> >> upmaster's branch: >> commit 447d77b9e33a68f748c96a152eae19148e43ed7c >> Author: Saul Wold >> Date: Thu Apr 19 11:01:15 2012 -0700 >> >> binutils: add embedspu for ppc builds >> >> WARNING: For recipe binutils, the following files/directories were >> installed but not shipped in any package: >> WARNING: /usr/bin/embedspu >> Signed-off-by: Saul Wold >> >> how ever when I format this commit with patches it pacth failed to >> local_branch, the reson is local branch has patched with this commit's >> changes but with another commit id >> >> loca_branch: >> commit 15c8ea4d35edbcaf03c94aba06ded85851679157 >> Author: Saul Wold >> Date: Thu Apr 19 11:01:15 2012 -0700 >> >> binutils: add embedspu for ppc builds >> >> WARNING: For recipe binutils, the following files/directories were >> installed but not shipped in any package: >> WARNING: /usr/bin/embedspu >> Signed-off-by: Saul Wold >> >> they have the same content but different commit id >> >> how chould I avoid this duplicate patches ( to get a list not duplicate) >> >> Lei >> > > Hi, > > I'm afraid I still don't understand your problem. > > Please explain, at a higher/abstract level what you are trying to achieve > here. Perhaps someone has ideas for an approach that would be better. > > Then tell us exactly which git commands you are using, what output they > produce, what you were expecting and if possible an example repository > where we can recreate the problem. If not, describe the repositories, the > branches and their configuration as clearly as possible. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To view this discussion on the web visit > https://groups.google.com/d/msg/git-users/-/sDS57UffeRMJ. > To post to this group, send email to git-users@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] from the commit titles to get the commit ids
Hi experts I have a file which comtains commit title #cat file Revert "eglibc: fix perl path in target scripts on fedora 17 eglibc: fix perl path in target scripts on fedora 17 alpha eglibc: fix re-execution of task how could I change the title to the commit id lists? Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] how to git format patch without swith to that branch
Hi I want to format patch from branch A, but current branch is B, is it possible to format patch without switching to B? Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] how to git format patch without swith to that branch
how to? Lei On Tue, Jul 24, 2012 at 12:18 AM, Konstantin Khomoutov wrote: > On Mon, 23 Jul 2012 23:43:50 +0800 > lei yang wrote: > >> I want to format patch from branch A, but current branch is B, is it >> possible to format patch without switching to B? > Yes. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] how to git format patch without swith to that branch
On Tue, Jul 24, 2012 at 7:53 PM, Thomas Ferris Nicolaisen wrote: > On Tuesday, July 24, 2012 7:05:14 AM UTC+2, lei yang wrote: >> >> how to? >> > > If you want to format-patch for example the last two commits on branch B, > this should do it: > > git format-patch B~2..B > Yes I know this, but I don't know how to fromat it with commit without switching to B eg: git format-patch commit1..commit2, but How could I could I format branch B's? > The dot-dot (..) notation specifies a range from B-minus-two to B-head. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To view this discussion on the web visit > https://groups.google.com/d/msg/git-users/-/T-UD6NjibKEJ. > To post to this group, send email to git-users@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] about git commit -m add the more than two lines log
I know git commit -m "somethingsomething" will give the git info in the git log but I don't know how to write some thing with more than two line some thing like something something something something something something in the git log -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] git help about git merge to a specific dir and keep the commit log
Hi experts, I have two tree A and B, A: git://github.com/lei/A.git B: git://github.com/lei/B.git B is like [lyang0@ubuntu B]$ ls benchmark box-opening kvm I want merge A tree to B, 1) put A's content to the "kvm" directory of B 2)I want to keep all the A's commit log(history) into B's tree can you give me some instruction? Thanks Lei --
Re: [git-users] Digest for git-users@googlegroups.com - 4 Messages in 1 Topic
On Tue, Dec 11, 2012 at 10:02 AM, King Jin wrote: > git submodule might be the one you are looking for. > > $git clone git://github.com/lei/B.git B > $cd B > $git submodule add git://github.com/lei/A.git kvm > $git submodule update > Thanks it works for me, and if I do a 'git push', and then clone it to local and git pull, does it update the kvm part if kvm part has update? Lei > anyone else cloned your repo B, just run `git submodule update` (exclude `) > will get the commit history of repo A by changing current working directory > to kvm and run git log. > > On Tue, Dec 11, 2012 at 8:49 AM, wrote: >> >> Today's Topic Summary >> >> Group: http://groups.google.com/group/git-users/topics >> >> git help about git merge to a specific dir and keep the commit log [4 >> Updates] >> >> git help about git merge to a specific dir and keep the commit log >> >> lei yang Dec 10 04:35PM +0800 >> >> Hi experts, >> >> I have two tree A and B, >> A: git://github.com/lei/A.git >> B: git://github.com/lei/B.git >> >> B is like >> [lyang0@ubuntu B]$ ls >> benchmark box-opening kvm >> >> I want merge A tree to B, >> 1) put A's content to the "kvm" directory of B >> 2)I want to keep all the A's commit log(history) into B's tree >> >> can you give me some instruction? Thanks >> >> Lei >> >> >> >> John McKown Dec 10 06:42AM -0800 >> >> I think this is similar to what I gave to a post a couple of days ago. You >> might try the following on your local machine. I will show the commands >> that I would enter in a Linux BASH shell. I don't do Windows or MacOSX, >> but >> you seem to be on Ubuntu.. First, I would clone the B repository into a >> local working directory. I would then clone A into a different local >> working directory. Of course, double check the results of all the commands >> after doing them and stop if something goes wrong. I have not redone them >> myself to remind myself exactly what to do. It's why I'm showing doing >> this >> into new subdirectories. Make sure the new B working directory is good >> before pushing to github! >> >> cd ~/some-subdir #go someplace to make the new A and B working directories >> git clone git://github.com/lei/A.git >> git clone git://github.com/lei/B.git >> cd A >> git checkout -b kvm #make a new branch in A >> mkdir kvm #make a kvm directory for A >> git mv * kvm #move everything into it >> git commit -m 'move to kvm subdirectory for copy to B' #Needed??? >> cd ../B #go to the B subdirectory >> git remote add temp ../A/.git #make A's .git directory a remote here >> git merge --no-commit temp kvm #merge in A's kvm branch >> git commit -m 'Copy all of kvm from project A' >> git remote rm temp #remove that temp repository >> git push #update github. >> >> I think that is fairly close to what you may need. Perhaps one of the true >> "old, wise ones" (I'm an "old, not-so-wise one") will also give you some >> pointers. >> >> On Monday, December 10, 2012 2:35:58 AM UTC-6, lei yang wrote: >> >> >> >> John McKown Dec 10 08:12AM -0800 >> >> possible mini bug, instead of: >> >> git mv * kvm >> >> use >> >> git mv \* kvm >> >> The \ in front of the * tells git to expand the file names instead of >> having the shell do it. My mistake. >> >> On Monday, December 10, 2012 2:35:58 AM UTC-6, lei yang wrote: >> >> >> >> Konstantin Khomoutov Dec 10 08:30PM +0400 >> >> On Mon, 10 Dec 2012 16:35:58 +0800 >> > 1) put A's content to the "kvm" directory of B >> > 2)I want to keep all the A's commit log(history) into B's tree >> >> > can you give me some instruction? Thanks >> >> This is what the "add" commmand of git-subtree [1] does. >> Note that since 1.7.11, this script is included in Git, in its >> "contrib" directory, so it's callable from there. >> >> 1. https://github.com/apenwarr/git-subtree >> >> >> >> You received this message because you are subscribed to the Google Group >> git-users. >> You can post via email. >> To unsubscribe from this group, send an empty message. >> For more options, visit this group. >> >> -- >> >> > > > -- > > --
Re: [git-users] Re: git help about git merge to a specific dir and keep the commit log
Thanks it works for me, It maybe mv "kvm: itself to "kvm" dir, anyway you instruction perform well for me thanks again and I will try git mv \* kvm Lei On Tue, Dec 11, 2012 at 12:12 AM, John McKown wrote: > possible mini bug, instead of: > > git mv * kvm > > use > > git mv \* kvm > > The \ in front of the * tells git to expand the file names instead of having > the shell do it. My mistake. > > > On Monday, December 10, 2012 2:35:58 AM UTC-6, lei yang wrote: >> >> Hi experts, >> >> I have two tree A and B, >> A: git://github.com/lei/A.git >> B: git://github.com/lei/B.git >> >> B is like >> [lyang0@ubuntu B]$ ls >> benchmark box-opening kvm >> >> I want merge A tree to B, >> 1) put A's content to the "kvm" directory of B >> 2)I want to keep all the A's commit log(history) into B's tree >> >> can you give me some instruction? Thanks >> >> Lei > > -- > > --
Re: [git-users] Digest for git-users@googlegroups.com - 4 Messages in 1 Topic
On Tue, Dec 11, 2012 at 11:00 AM, lei yang wrote: > On Tue, Dec 11, 2012 at 10:02 AM, King Jin wrote: >> git submodule might be the one you are looking for. >> >> $git clone git://github.com/lei/B.git B >> $cd B >> $git submodule add git://github.com/lei/A.git kvm >> $git submodule update >> > > Thanks it works for me, and if I do a 'git push', and then clone it to local > and git pull, does it update the kvm part if kvm part has update? I just did a try, it doesn't update the kvm dir,how can I Do a git pull in B an then it can update kvm dir in B Lei > > Lei > >> anyone else cloned your repo B, just run `git submodule update` (exclude `) >> will get the commit history of repo A by changing current working directory >> to kvm and run git log. >> >> On Tue, Dec 11, 2012 at 8:49 AM, wrote: >>> >>> Today's Topic Summary >>> >>> Group: http://groups.google.com/group/git-users/topics >>> >>> git help about git merge to a specific dir and keep the commit log [4 >>> Updates] >>> >>> git help about git merge to a specific dir and keep the commit log >>> >>> lei yang Dec 10 04:35PM +0800 >>> >>> Hi experts, >>> >>> I have two tree A and B, >>> A: git://github.com/lei/A.git >>> B: git://github.com/lei/B.git >>> >>> B is like >>> [lyang0@ubuntu B]$ ls >>> benchmark box-opening kvm >>> >>> I want merge A tree to B, >>> 1) put A's content to the "kvm" directory of B >>> 2)I want to keep all the A's commit log(history) into B's tree >>> >>> can you give me some instruction? Thanks >>> >>> Lei >>> >>> >>> >>> John McKown Dec 10 06:42AM -0800 >>> >>> I think this is similar to what I gave to a post a couple of days ago. You >>> might try the following on your local machine. I will show the commands >>> that I would enter in a Linux BASH shell. I don't do Windows or MacOSX, >>> but >>> you seem to be on Ubuntu.. First, I would clone the B repository into a >>> local working directory. I would then clone A into a different local >>> working directory. Of course, double check the results of all the commands >>> after doing them and stop if something goes wrong. I have not redone them >>> myself to remind myself exactly what to do. It's why I'm showing doing >>> this >>> into new subdirectories. Make sure the new B working directory is good >>> before pushing to github! >>> >>> cd ~/some-subdir #go someplace to make the new A and B working directories >>> git clone git://github.com/lei/A.git >>> git clone git://github.com/lei/B.git >>> cd A >>> git checkout -b kvm #make a new branch in A >>> mkdir kvm #make a kvm directory for A >>> git mv * kvm #move everything into it >>> git commit -m 'move to kvm subdirectory for copy to B' #Needed??? >>> cd ../B #go to the B subdirectory >>> git remote add temp ../A/.git #make A's .git directory a remote here >>> git merge --no-commit temp kvm #merge in A's kvm branch >>> git commit -m 'Copy all of kvm from project A' >>> git remote rm temp #remove that temp repository >>> git push #update github. >>> >>> I think that is fairly close to what you may need. Perhaps one of the true >>> "old, wise ones" (I'm an "old, not-so-wise one") will also give you some >>> pointers. >>> >>> On Monday, December 10, 2012 2:35:58 AM UTC-6, lei yang wrote: >>> >>> >>> >>> John McKown Dec 10 08:12AM -0800 >>> >>> possible mini bug, instead of: >>> >>> git mv * kvm >>> >>> use >>> >>> git mv \* kvm >>> >>> The \ in front of the * tells git to expand the file names instead of >>> having the shell do it. My mistake. >>> >>> On Monday, December 10, 2012 2:35:58 AM UTC-6, lei yang wrote: >>> >>> >>> >>> Konstantin Khomoutov Dec 10 08:30PM +0400 >>> >>> On Mon, 10 Dec 2012 16:35:58 +0800 >>> > 1) put A's content to the "kvm" directory of B >>> > 2)I want to keep all the A's commit log(history) into B's tree >>> >>> > can you give me some instruction? Thanks >>> >>> This is what the "add" commmand of git-subtree [1] does. >>> Note that since 1.7.11, this script is included in Git, in its >>> "contrib" directory, so it's callable from there. >>> >>> 1. https://github.com/apenwarr/git-subtree >>> >>> >>> >>> You received this message because you are subscribed to the Google Group >>> git-users. >>> You can post via email. >>> To unsubscribe from this group, send an empty message. >>> For more options, visit this group. >>> >>> -- >>> >>> >> >> >> -- >> >> --
[git-users] ls it possible to change the commit info
HI experts my git log is something like #git log commit a83052d1f102341bb5931955658266882d7b8953 Author: Lei Yang Date: Tue Dec 11 13:36:45 2012 +0800 add testfileA2.add commit b8558af3986384e657bfdbc48154830395b340c6 Author: Lei Yang Date: Tue Dec 11 13:30:10 2012 +0800 rm testfileA1.add commit ad9d46d348542bb4b7d8d09fbe6b4a6548cb68ff Merge: acaa35d aaa479a Author: Lei Yang Date: Tue Dec 11 13:37:01 2012 +0800 Merge branch 'master' of github.com:leiyang/git_testA I find "rm testfileA1.add" is wrong, I want to change it to "add testfileA1.add", and DON'T leave "rm testfileA1.add" info in the commit log Is it possible? Lei --
[git-users] about add one remote's branch to local branch and keep update
Hi experts, I use below command to add a remote git's branch to local branch git fetch g...@github.com:leiyang/git_testA.git master:local The question is: if remote tree's "master" branch update, how could I update local tree's "local" branch to sync with remote tree's "master"? Thanks Lei --
[git-users] Is it possible cp some file from one branch to another without switch branch
Hi expert, now I'm in the branch A, I want to copy some file from branch B to A any help? Lei --
Re: [git-users] Is it possible cp some file from one branch to another without switch branch
Thanks for the tips, I have another question, If I forget branch B files' path, how chould I do without switch to B Lei On Mon, Dec 17, 2012 at 6:18 AM, Konstantin Khomoutov wrote: > On Mon, 17 Dec 2012 04:58:53 -0800 > lei yang wrote: > >> now I'm in the branch A, I want to copy some file from branch B to A >> >> any help? > > Note that the already proposed > > git checkout $branch -- $filename > git add $filename > > approach does not copy the file's history recorded in -- you > only get the file's contents. > In general, it's impossible to copy a file from one branch to another, > preserving its history. > > Also note that if you want to save the file's contents into a > differently named file, you should use another approach: > > git show $branch:$filename > $newfilename --
Re: [git-users] Re: Is it possible cp some file from one branch to another without switch branch
Thanks very much! it works for me Lei On Mon, Dec 17, 2012 at 5:23 AM, Thomas Ferris Nicolaisen wrote: > On Monday, December 17, 2012 1:58:53 PM UTC+1, lei yang wrote: >> >> Hi expert, >> >> now I'm in the branch A, I want to copy some file from branch B to A >> >> any help? >> > > You have to commit changes in the current branch, so you have to switch > first to the branch where you want to add and commit the file, check out the > file from the other branch, and then commit it: > > #initial check in of the file in branch B: > git checkout B > git add some-file.txt > git commit -m "Added some file" > > Now copy the file over to branch A: > > git checkout A > git checkout B some-file.txt > git status > # On branch A > # Changes to be committed: > # (use "git reset HEAD ..." to unstage) > # > # new file: some-file.txt > # > > -- > > --
[git-users] git config fetch.recurseSubmodules true && git pull doesn't update the submodule
Hi expert, I want others when they "git pull" it also update the submoudles .but below two ways don't work for me 1) git config fetch.recurseSubmodules true && git pull 2) git config alias.pullall '!git pull && git submodule update --init --recursive' > it works with git pullall but I don't know how let it work with "git pull" git config alias.pull '!git pull && git submodule update --init --recursive' ---> by remove "all" it doesn't work Thanks Lei --
Re: [git-users] git config fetch.recurseSubmodules true && git pull doesn't update the submodule
On Wed, Dec 26, 2012 at 8:57 PM, Konstantin Khomoutov wrote: > On Wed, 26 Dec 2012 12:49:43 +0800 > lei yang wrote: > >> I want others when they "git pull" it also update the submoudles .but >> below two ways don't work for me >> >> 1) >> git config fetch.recurseSubmodules true && git pull >> >> 2) >> git config alias.pullall '!git pull && git submodule update --init >> --recursive' > it works with git pullall >> but I don't know how let it work with "git pull" >> git config alias.pull '!git pull && git submodule update --init >> --recursive' ---> by remove "all" it doesn't work > > I don't know for sure, but it seems Git aliases do not override > built-in commands, and I think this is an obviously right thing. > I see no problem with using `git pullall` to do what you need instead > of trying to *override* the default. If "pullall" is too long-winded > for you, make it "pa" instead. Thanks for the reply.Good question Because I want to put a submodule in tree, but others may NOT know this, they often do "git pull" to update. and don't know it has a submodule there. I don't want to introduce trouble Lei --
Re: [git-users] git config fetch.recurseSubmodules true && git pull doesn't update the submodule
On Wed, Dec 26, 2012 at 4:57 AM, Konstantin Khomoutov wrote: > On Wed, 26 Dec 2012 12:49:43 +0800 > lei yang wrote: > >> I want others when they "git pull" it also update the submoudles .but >> below two ways don't work for me >> >> 1) >> git config fetch.recurseSubmodules true && git pull >> >> 2) >> git config alias.pullall '!git pull && git submodule update --init >> --recursive' > it works with git pullall >> but I don't know how let it work with "git pull" >> git config alias.pull '!git pull && git submodule update --init >> --recursive' ---> by remove "all" it doesn't work > > I don't know for sure, but it seems Git aliases do not override > built-in commands, and I think this is an obviously right thing. > I see no problem with using `git pullall` to do what you need instead > of trying to *override* the default. If "pullall" is too long-winded > for you, make it "pa" instead. Thanks for the reply.Good question Because I want to put a submodule in tree, but others may NOT know this, they often do "git pull" to update. and don't know it has a submodule there. I don't want to introduce trouble Lei --
[git-users] download a directory or file without clone the whole tree
Hi experts I find my treeA want to have another treeB's dir, I don't want to clone the whole treeB, I don't know can we do it with git the get treeB's dir Lei --
[git-users] git send-email with "space" help
git send-email -2 --to lei.y...@windriver.com --subject-prefix=meta-networking][PATCH:V2> works results: subject is : [meta-networking][PATCH:V2 1/2] Removing README from libvirt and qemu dirs but I want [meta-networking][PATCH V2 1/2] Removing README from libvirt and qemu dirs git send-email -2 --to lei.y...@windriver.com --subject-prefix=meta-networking][PATCH V2 ---> doesn't work with "space"V2 But I did see someone's patch in the email subject has a "space" how it used ? Lei --
[git-users] git request-pull? how to
--
[git-users] git request-pull? how to?
Hi experts I always see something like http://comments.gmane.org/gmane.linux.drivers.video-input-infrastructure/54774 Then it follows patches, I don't know how to get the first one, which is not code changes but some info like "changes since vx", and then list the modified files I also see something like https://lkml.org/lkml/2012/9/10/158, I'm not sure they get it use the same way can you give me an examples, it likes a git request-pull or something else? Lei --
Re: [git-users] git request-pull? how to?
On Tue, Jan 15, 2013 at 5:33 AM, Konstantin Khomoutov wrote: > On Tue, 15 Jan 2013 19:30:04 +0800 > lei yang wrote: > >> I always see something like >> http://comments.gmane.org/gmane.linux.drivers.video-input-infrastructure/54774 > > Looks like the result of `git format-patch` with the "--cover-letter" > command-line argument used. Thanks, then I googled, I use git send-email -3 --annotate --cover-letter --to yanglei.f...@gmail.com then it tell me edit the letter, then I edit it, and save it tells me "4 more files to edit", not sure this is a reminder or error? and then Ipress "enter" and save it, it will send the mail another two question: 1)does mantainer know the first letter will not merge as patch? 2)I don't know how to get below in https://lkml.org/lkml/2012/9/10/158 The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0: Linux 3.6-rc3 (2012-08-22 13:29:06 -0700) are available in the git repository at: --
[git-users] Question about git request pull email
Hi experts, I see below -- Updating guilt to allow git 1.8.x as a supported version. This version has no impact on other functionality within the scripts, so no other adjustments are necessary. This addresses [YOCTO #3275] Cheers, Bruce The following changes since commit 3db277b18b8923daca545aa53bcfbbe9d43d3baa: update-rc.d: fix failure on target (2013-01-17 20:16:46 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel I know that The following changes since commit 3db277b18b8923daca545aa53bcfbbe9d43d3baa: update-rc.d: fix failure on target (2013-01-17 20:16:46 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kerne can be created by git request-pull but I don't know how added below to that email? -- Updating guilt to allow git 1.8.x as a supported version. This version has no impact on other functionality within the scripts, so no other adjustments are necessary. This addresses [YOCTO #3275] Cheers, Bruce - Question2: After this email it will send [PATCH 1/7] xxx, [PATCH 2/7] yyy, how it send, I know git send-mail can do to seend the patch work but it seems it dones this by one action to " send a pull requestion, patch1 patch2, can you point me about this with steps Lei --
[git-users] how to get a patch summary like below
Hi
is there a way to get below info?
[PATCH 1/3] kernel-yocto: remove unnecessary non-bare warning
In the past working from a non-bare clone would cause problems,
due to branches not existing in the WORKDIR clone. This hasn't
been true for some time, since the routines which convert remotes
into local branches have been functioning without problems.
So we no longer need the warning and it can be removed.
This cleans up the output and removes a potentially alarming warning ..
that shouldn't be alarming anymore.
[PATCH 2/3] linux-yocto: normalize repository naming and SRC_URI options
linux-yocto-tiny and linux-yocto had minor differences from the rest
of the linux-yocto recipes. After this commit, all the recipes are
using bareclone=1 and repository names that end with .git.
[PATCH 3/3] kernel-yocto: add KBUILD_OUTPUT to OE_TERMINAL_EXPORTS
Since linux-yocto based recipes have a split build and source directory,
we should export KBUILD=${B} to the devshell. This allows the kernel to
be incrementally build within the shell and not dirty the source
directory (which breaks subsequent full builds).
This was discussed on the mailing lists in December and has been working
locally for me ever since.
--
[git-users] help, about git send email seting
When I use git send-email I aways get below confirmation info Who should the emails appear to be from? [Lei Yang ] Emails will be sent from: Lei Yang Message-ID to be used as In-Reply-To for the first email? before, I don't get this confirmation now I use I newly installed os to use new installed git, any setting for this ? Thanks Lei --
[git-users] it's not safe to set password wtih git config, can we not set it,
git config --global sendemail.smtppass this will display password in .git config can we avoid this ? lei --
Re: [git-users] it's not safe to set password wtih git config, can we not set it,
On Sat, Jan 19, 2013 at 1:00 AM, Konstantin Khomoutov wrote: > On Sat, 19 Jan 2013 00:37:20 +0800 > lei yang wrote: > >> git config --global sendemail.smtppass this will display >> password in .git config >> >> can we avoid this ? > > Yes, do not keep passwords in your configuration files. but if we don't put it in the configuration file, it will let me input it, that's not a easy life, how do you do that Lei --
[git-users] Does git request-pull and git send-email to combine ?
Hi experts I want send a pull request following the patches email, is it possible? Lei --
[git-users] which commit ever change FULL_OPTIMIZATION in this file
Hi experts,
lyang001@lyang0-9010:~/kvm_32/layers/oe-core$ git blame -c
meta/conf/bitbake.conf
9cb71137 meta/conf/bitbake.conf (Khem Raj
2011-03-17 16:54:30 -0700 524) FULL_OPTIMIZATION = "-O2 -pipe
${DEBUG_FLAGS}"
lyang001@lyang0-9010:~/kvm_32/layers/oe-core$ git show 9cb71137
commit 9cb7113790d716a4c5cf7d511535ba87fdecd1ac
Author: Khem Raj
Date: Thu Mar 17 16:54:30 2011 -0700
.."
##
# Optimization flags.
##
-
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer
-frename-registers -O2 -ggdb -feliminate-unused-debug-types"
-DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g"
+DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types -feliminate-dwarf2-dups"
+FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
+DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION',
'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d,
1)}"
-BUILD_OPTIMIZATION = "-O2"
+BUILD_OPTIMIZATION = "-O2 -pipe"
git blame tells me 9cb71137 ever change it .but it doesn't all the
commit that change it ever, an help
--
Re: [git-users] which commit ever change FULL_OPTIMIZATION in this file
seems not work for me
lyang001@lyang0-9010:~/kvm_32/layers/oe-core$ git blame
meta/conf/bitbake.conf |grep FULL_OPTIMIZATION
9cb71137 meta/conf/bitbake.conf (Khem Raj
2011-03-17 16:54:30 -0700 524) FULL_OPTIMIZATION = "-O2 -pipe
${DEBUG_FLAGS}"
2864ff6a meta/conf/bitbake.conf (Richard Purdie
2011-11-25 14:25:16 + 526) SELECTED_OPTIMIZATION =
"${@d.getVar(['FULL_OPTIMIZATION',
'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', True) == '1'], True)}"
5b9877aa meta/conf/bitbake.conf (Chris Larson
2011-11-16 14:17:21 -0700 527) SELECTED_OPTIMIZATION[vardeps] +=
"FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
lyang001@lyang0-9010:~/kvm_32/layers/oe-core$ git log -F
-SFULL_OPTIMIZATION -- meta/conf/bitbake.conf |grep 9cb71137
lyang001@lyang0-9010:~/kvm_32/layers/oe-core$
< it can't get 9cb71137>
Lei
On Tue, Jan 22, 2013 at 1:26 AM, Konstantin Khomoutov
wrote:
> FULL_OPTIMIZATION
--
[git-users] add the code file by other write,and keep others know it's written by him in commit log
Hi if want to add foo.c to my git repos ,I want to keep others know foo.c is written by phil, and better to leave the origin commit message.how could I do? note: I can't use format-patch, because they have different path for this file. Thanks Lei --
[git-users] acked by ,test by, how to add them. automatically? and what does it mean
Hie experts, see below commit: commit abb959f8a3f125a6e6641abbd020111516dfc8f6 Author: Javi Merino Date: Fri Dec 16 16:04:36 2011 +0100 ARM: 7237/1: PL330: Fix driver freeze Add a req_running field to the pl330_thread to track which request (if any) has been submitted to the DMA. This mechanism replaces the old one in which we tried to guess the same by looking at the PC of the DMA, which could prevent the driver from sending more requests if it didn't guess correctly. Reference: <1323631637-9610-1-git-send-email-javi.mer...@arm.com> Signed-off-by: Javi Merino Acked-by: Jassi Brar Tested-by: Tushar Behera Signed-off-by: Russell King I know git commit -s can add my self with "signed off by me" but how to get acked by and tested by? other 2 questions: 1) what does mean acked by? 2) what's the different for the first signed off with the last signed-off Lei --
Re: [git-users] add the code file by other write,and keep others know it's written by him in commit log
On Fri, Jan 25, 2013 at 12:46 AM, Konstantin Khomoutov wrote: > On Fri, 25 Jan 2013 00:36:02 +0800 > lei yang wrote: > >> if want to add foo.c to my git repos ,I want to keep others know foo.c >> is written by phil, and better to leave the origin commit message.how >> could I do? > > I'm not sure I was able to parse the question correctly, but it seems > you want to commit a file authored by someone else. > > For this very reason Git distinguishes between the committer -- a > person who actually recorded a commit -- and the author -- a person who > authored the change. Typically these fields are the same in a commit, > but they might differ, for instance, when importing the changes from > patch files, and you might specify the author when doing `git commit` > by supplying it the "--author=..." command-line option. > >> note: I can't use format-patch, because they have different path for >> this file. > > A patch is just a text file -- you are free to change paths in its > hunks using a text editor. Thanks --author works for me, if I use git am xx.patch with your method to change the path, it can't add sign-off by me, what I mean: I want to let other know this patch is phil write, and integrate by me to my git repos Lei --
Re: [git-users] Re: acked by ,test by, how to add them. automatically? and what does it mean
On Sun, Jan 27, 2013 at 4:38 PM, milki wrote: > On Thursday, January 24, 2013 8:40:20 AM UTC-8, lei yang wrote: >> >> I know git commit -s can add my self with "signed off by me" but how >> to get acked by and tested by? > > > Many workflow tools will automatically add these lines. You can either use > those tools (usually code review software) or use git hooks > (prepare-commit-msg maybe) to add those lines. > what's "code review software", I should google it by which key word. prepare-commit-msg works for me, it seems if I create a new repos, I have to re-modify the .git/.hooks/prepare-commit-msg, not very good Lei > -milki > > -- > > --
[git-users] when or which commit delete this file
Hi experts, I have a file named foo.c, which is in tree, not I find it's removed, how could I which commit delete it ? Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] To know the string in which branch
Hi expert, Is there a git command to know string "foo" contains in which branch? Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] how to create a new empty branch
Hi experts, how to create a new empty branch, any command? Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] create a new branch with the contents from current branch's dir
Hi experts, Branch A content is lyang001@lyang001-OptiPlex-9010:~/meta-networking$ ls README recipes-connectivity recipes-daemons recipes-filter recipes-protocols recipes-support sub.sh xx.sh I want to create a new branch named "support" and make it contain "recipes-support" (recipes-support is a directory and contains lots of file ) eg: the "support" branch should be like below lyang001@lyang001-OptiPlex-9010:~/meta-networking$ ls recipes-support Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] from the commit message to get its in which branch or tag
Hi experts, commit bd01370ca2aabc4d683a3b8e04817ee3bc97ad0b Author: Paul Eggleton Date: Tue Sep 25 15:58:32 2012 +0100 layer.conf: allow other layers to depend on this version Set LAYERVERSION and rename the collection to "core". Given changes such as the tabs to spaces cleanup for python functions in the current version, this allows other layers to depend on this version of OE-Core specifically should they choose to do so, by specifying the following in their own layer.conf: I want to know from " allow other layers to depend on this version", can we get this patch is in which tag or branch? since commit id maybe different, so I don't want to get this from commit id Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] from the commit message to get its in which branch or tag
On Mon, Mar 18, 2013 at 6:03 AM, Johan 't Hart wrote: > Wasnt there something like patch-id you can use in this case? > [lyang0@ala-lpd-test1 linux]$ git format-patch c51a3d140bb726a662a867a2ae4098cc311347d7^..c51a3d140bb726a662a867a2ae4098cc311347d7 -o /tmp//tmp/0001-x86-mce-Do-not-change-worker-s-running-cpu-in-cmci_r.patch [lyang0@ala-lpd-test1 linux]$ git patch-id < /tmp/0001-x86-mce-Do-not-change-worker-s-running-cpu-in-cmci_r.patche1f299654737b34f4ec6b03abdcb416cbc81b1d0 85b97637bb40a9f486459dd254598759af9c3d50 and why it gets two patch-id It doesn't get below commit id, which is the same patch too commit c51a3d140bb726a662a867a2ae4098cc311347d7Author: Tang Chen Date: Mon Oct 29 11:01:50 2012 +0800 x86/mce: Do not change worker's running cpu in cmci_rediscover(). commit 85b97637bb40a9f486459dd254598759af9c3d50 upstream Is there a way to search a branch for a commit with a certain patch id? > git branch --contains > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] from the commit message to get its in which branch or tag
On Tue, Mar 19, 2013 at 6:08 AM, Johan 't Hart wrote: > > > On Monday, March 18, 2013 4:40:55 PM UTC+1, lei yang wrote: >> >> >> >> On Mon, Mar 18, 2013 at 6:03 AM, Johan 't Hart wrote: >> >>> Wasnt there something like patch-id you can use in this case? >>> >> >> >> >> Is there a way to search a branch for a commit with a certain patch id? >>> >> >> git branch --contains >> > > Documentation of git-branch states: > --contains [] > > Only list branches which contain the specified commit (HEAD if not > specified). > > > So that sounds to me that this command will list all branches that contain > a specified , note: not a . > Should this also work with patch-ID's? > NOT work, because the commit-id maybe different, and patch-id can't be used here Lei > >> >> >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "Git for human beings" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to git-users+...@**googlegroups.com. >>> >>> For more options, visit >>> https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/opt_out> >>> . >>> >>> >>> >> -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] question: how to know from a commit id to know it's merged by which commit id
Hi experts I think I should have asked this question, but I can't find it know the question is I have a commit id A in tree, how could I know this commit is merged by which commit Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] help, why the same commit in one branch
On Thu, Mar 21, 2013 at 1:47 AM, Dale R. Worley wrote: > > From: lei yang > > > > I git clone git:// > > git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git > > > > find v3.7-rc1 has two same commit ,can some one give me a detailed > > explanation ? > > I see that two different commits, 33e1af... and efda0a... have very > similar commit comments, the same Author, and the same Date. But one > includes the line "Acked-by: Amit Shah ". I > suspect that the two commits have very different changes to the file > base. Perhaps one is intended to be an amendment to the other? One > documents a verification of the other? > > The have the same contents. Lei > Dale > > > lyang001@lyang001-OptiPlex-9010:~/trees/linux-stable$ git log v3.7-rc1 > -G > > "registering virtio driver" > > commit 33e1afc3d82697599ccc8dc8f2fa445ae329 > > Author: Alexey Khoroshilov > > Date: Sat Sep 1 23:49:37 2012 +0400 > > > > virtio: console: fix error handling in init() function > > > > If register_virtio_driver() fails, virtio-ports class is not > destroyed. > > The patch adds error handling of register_virtio_driver(). > > > > Found by Linux Driver Verification project (linuxtesting.org). > > > > Signed-off-by: Alexey Khoroshilov > > Acked-by: Amit Shah > > Signed-off-by: Rusty Russell > > > > commit efda0ad4aa92439d9244d77a13339e23df5e1dc1 > > Author: Alexey Khoroshilov > > Date: Sat Sep 1 23:49:37 2012 +0400 > > > > virtio: console: fix error handling in init() function > > > > If register_virtio_driver() fails, virtio-ports class is not > destroyed. > > The patch adds error handling of register_virtio_driver(). > > > > Found by Linux Driver Verification project (linuxtesting.org). > > > > Signed-off-by: Alexey Khoroshilov > > Signed-off-by: Greg Kroah-Hartman > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] help, why the same commit in one branch
On Thu, Mar 21, 2013 at 9:40 PM, Dale R. Worley wrote: > > From: lei yang > > > > The have the same contents. > > Meaning that the older commit causes significant changes to the files > and the newer commit causes no changes to the files. So someone made > a second commit that changed nothing but provided a slightly different > commit message. > > I git show , it does change code, and the same as the first Lei > Dale > > Dale Worley > -- > The French are not against arrogance per se, but in the case of the > United States they regard the arrogance as completely unjustified. > -- "What's So Great About America" by Dinesh D'Souza > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Re: question: how to know from a commit id to know it's merged by which commit id
On Wed, Mar 20, 2013 at 7:55 PM, Thomas Ferris Nicolaisen wrote: > On Wednesday, March 20, 2013 11:34:50 AM UTC+1, lei yang wrote: > >> Hi experts >> >> I think I should have asked this question, but I can't find it know the >> question is >> >> I have a commit id A in tree, how could I know this commit is merged by >> which commit >> >> >> > First google result for "find merge commit": > http://stackoverflow.com/questions/8475448/find-merge-commit-which-include-a-specific-commit > > Thanks it works for me, another question is if I know the merge commit id A, can i get the list for the commit it merged by A? Lei > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] commit ee50e135aeb048b90fab662e661c58b67341830b upstream, how is the message produced
Hi experts, I don't know how the upstream info produced, it seems not get with "git cherry-pick -x " can you point me commit 83829ab554f01ee5fcef4880b0a90cc14350b936 Author: Olivier Sobrie Date: Fri Jan 18 09:32:41 2013 +0100 can: pch_can: fix invalid error codes commit ee50e135aeb048b90fab662e661c58b67341830b upstream. Errors in CAN protocol (location) are reported in data[3] of the can frame instead of data[2]. Signed-off-by: Olivier Sobrie Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to edit commit messages
On Sun, Mar 24, 2013 at 9:22 PM, Surya wrote: > The open source community in which I am contributing has certain standards > on writing commit messages I didn't knew earlier. > > They want me to edit commit message according to standards.. So, how to > edit commit messages? > > git commit --amend for the top commit to edit the commit git rebase -i to edit all the commit message from sha1 Lei > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] git bare clone and pull to latest one
Hi I git bare clone linux tree with git clone git:// git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git then I can git clone /home/lyang001/trees/linux-stable-rt/inux-stable-rt to get it my question if linux-stable-rt.git updates, how could I sync it to the latest, git pull in the bare clone tree failed here, can you point me the right steps to use bare clone tree Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] git bare clone and pull to latest one
On Tue, Mar 26, 2013 at 1:14 AM, Konstantin Khomoutov < flatw...@users.sourceforge.net> wrote: > On Tue, 26 Mar 2013 00:12:23 +0800 > lei yang wrote: > > > I git bare clone linux tree with > > git clone git:// > > git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git > > It's not bare, unless you passed "--bare" to `git clone`. > Yes I want I'm missed --bare Actually, if you intend to host a mirror of that tree (as, it seems, you > do), you should have used `git clone --mirror` (which implies "--bare"). > > Thanks for the tips > > then I can git > > clone /home/lyang001/trees/linux-stable-rt/inux-stable-rt to get it > > > > my question if linux-stable-rt.git updates, how could I sync it to the > > latest, git pull in the bare clone tree failed here, can you point me > > the right steps to use bare clone tree > > Provided your mirror repository is indeed a mirror (a bare repo will > all remote refs fetched), the way to update it is > > $ cd /home/lyang001/trees/linux-stable-rt/inux-stable-rt > $ git fetch +refs/*:refs/* > I will have a try Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] question about patchwork
Hi expert, I have a question about find the patch from patchwork for example,from google I get https://patchwork.kernel.org/patch/1360421/ but how could I get [2/5] [3/5] any tips Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Fwd: question about patchwork
Found the answer: click the "patches", and click "Filters" to search "trace-cmd" to get patchworks' patch, we can download tools "pwclient" to get the patch after clicking "project info" Lei On Tue, Apr 9, 2013 at 11:06 AM, lei yang wrote: > Hi expert, > > I have a question about find the patch from patchwork > > for example,from google I get > > https://patchwork.kernel.org/patch/1360421/ > > but how could I get [2/5] [3/5] > > any tips > > Lei > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] recover from hard reset
Hi experts I commit a change to my local git repos, but I did a git hard --reset local_commit^, and then my local changes disappeared, how could I recover my local changes ? Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] recover from hard reset
hi You misunderstand my question,I want to recover my local changes, after I do a hard reset ,it's gone. Sent from my iPhone On 2013-4-29, at 14:10, John McKown wrote: > I'm no expert, but I'd try: > > git reset --hard local_commit > > if "local_commit" is some sort of name. Or it can be that long 40 > character commit value. If you don't know where you want to go back > to, you might try a > > git log > > to find the commit value and use it (cut and paste if possible. I > don't like typing "random" 40 character values.) > > Well, it's 01:00 local time. You'd think that a 60-year old would know > better than to drink a large caffeinated beverage before bed time. > You'd be wrong, in my case. > > BTW, did you mean to do a --mixed (reset HEAD & index) or --soft (only > reset HEAD). > > Note if you did some work between the > > git commit local_commit^ > > and the > > git reset --hard > > then you can't recover those changes at all. git did not track them > and so they are GONE and totally unrecoverable. The reset --hard reset > both the files in the directory and the index. > > On Mon, Apr 29, 2013 at 12:28 AM, lei yang wrote: >> Hi experts >> >> I commit a change to my local git repos, but I did a git hard --reset >> local_commit^, and then my local changes disappeared, how could I >> recover my local changes ? >> >> Thanks >> Lei >> >> -- >> You received this message because you are subscribed to the Google Groups >> "Git for human beings" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to git-users+unsubscr...@googlegroups.com. >> For more options, visit https://groups.google.com/groups/opt_out. > > > > -- > This is a test of the Emergency Broadcast System. If this had been an > actual emergency, do you really think we'd stick around to tell you? > > Maranatha! <>< > John McKown > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] compare the two branch and only output the content with the "changed files"
Hi experts, I know we can use git log branch1 branch2 --name-status to get the changed file plus the commit message but if I only want to get the changed files, how could i do Thanks Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] list all the branch that contains commit title is "xxxx yyyy"
list all the branch that contains commit title is " " note: the commit-id is not the same though the commit content is the same in different branch -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: list all the branch that contains commit title is "xxxx yyyy"
any help ? On Tue, Jun 4, 2013 at 11:24 AM, lei yang wrote: > list all the branch that contains commit title is " " note: the > commit-id is not the same though > the commit content is the same in different branch > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] [git-user] how to know the two commit is the same
Hi expert, I have two commit in different branch, the commit-id is different, but and the content is the same, is there a method to prove it's the same use one-liner Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Is there a place record when I run "git pull" the last time
Hi experts Is there a place record when I run "git pull" the last time Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Is there a place record when I run "git pull" the last time
Thanks, that's what exactly I want Lei On Tue, Oct 15, 2013 at 4:47 PM, Benoit Person wrote: > Hi, > > If I understand correctly what you're asking for, the most reliable > way is to read the modification date of the .git/FETCH_HEAD file. > > This SW thread has more precisions: > > http://stackoverflow.com/questions/2993902/how-do-i-check-the-date-and-time-of-the-latest-git-pull-that-was-executed > > On 15 October 2013 10:24, lei yang wrote: > > Hi experts > > > > Is there a place record when I run "git pull" the last time > > > > Lei > > > > -- > > You received this message because you are subscribed to the Google Groups > > "Git for human beings" group. > > To unsubscribe from this group and stop receiving emails from it, send an > > email to git-users+unsubscr...@googlegroups.com. > > For more options, visit https://groups.google.com/groups/opt_out. > > > > -- > Benoit Person > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Is there a way to know when the commit has been in the git server
Hi expert, I know form the "git log" we can now the commit time, but how to know when it is in the remote git server Lei -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: Is there a way to know when the commit has been in the git server
I mean the real check-in time Lei On Mon, Oct 28, 2013 at 11:18 AM, lei yang wrote: > Hi expert, > > I know form the "git log" we can now the commit time, but how to know when > it is in the remote > git server > > Lei > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
