[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lmi] Proposed workflow for proprietary repository
From: |
Greg Chicares |
Subject: |
Re: [lmi] Proposed workflow for proprietary repository |
Date: |
Thu, 10 Mar 2016 20:31:12 +0000 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.5.0 |
On 2016-03-10 14:17, Vadim Zeitlin wrote:
[...]
> So I'd recommend doing "git reset --hard b5f2b3d" above and then running
> "git am --committer-data-is-author-date /path/to/first.patch" again. If it
> works this time, then you should obtain the same SHA-1 as Greg and be able
> to apply the second patch on top of it.
That didn't work. After trying and retrying the whole process from scratch
(including recreating a virgin repository) several times, Kim found a way
to make it work: use 'git config' to set her name and email address equal
to mine before applying my patches. That works: same sha1sums. Any other
identity fails: the patches apply correctly, but the sha1sums differ. Do
you know of a better workaround?
- Re: [lmi] Proposed workflow for proprietary repository, (continued)
- Re: [lmi] Proposed workflow for proprietary repository, Greg Chicares, 2016/03/07
- Re: [lmi] Proposed workflow for proprietary repository, Greg Chicares, 2016/03/08
- Re: [lmi] Proposed workflow for proprietary repository, Murphy, Kimberly, 2016/03/10
- Re: [lmi] Proposed workflow for proprietary repository, Vadim Zeitlin, 2016/03/10
- Re: [lmi] Proposed workflow for proprietary repository, Greg Chicares, 2016/03/10
- Re: [lmi] Proposed workflow for proprietary repository,
Greg Chicares <=
- Re: [lmi] Proposed workflow for proprietary repository, Vadim Zeitlin, 2016/03/10
- Re: [lmi] Proposed workflow for proprietary repository, Greg Chicares, 2016/03/10
- Re: [lmi] Proposed workflow for proprietary repository, Vadim Zeitlin, 2016/03/10
- Re: [lmi] Proposed workflow for proprietary repository, Greg Chicares, 2016/03/11
- Re: [lmi] Proposed workflow for proprietary repository, Vadim Zeitlin, 2016/03/11
Re: [lmi] Proposed workflow for proprietary repository, Greg Chicares, 2016/03/20