-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 04.05.2014 20:06, LRN wrote:
> On 04.05.2014 19:50, Dongsheng Song wrote:
>> On Sun, May 4, 2014 at 10:09 PM, JonY wrote:
>>> On 5/4/2014 12:17, NightStrike wrote:
>>>>
>>>> Now... that said, there's a few things that I didn't see addressed
>>>> anywhere in this thread.
>>>>
>>>> 1) Jon, you had asked me to setup a mailing list for svn commits.
>>>> I did so. Then SF added their own thing that just sends the commit
>>>> message without the patch in the body. So now we have both. What
>>>> is your plan with doing that for git? Are you going to still email
>>>> messages to a list? Are you going to do it per commit, or per
>>>> merge? Binutils recently tackled this same question, and they
>>>> settled on 1 email per commit. Also, would you only want emails on
>>>> a certain branch?
>>>>
>>>
>>> Per commit please, all branches.
>
>> Due to git merge, the commit maybe out of order, could you consider 1
>> email per push?
>
> Do rebase-with-history instead \o/
>
>
Just tested git-imerge rebase --goal=rebase-with-history on a simple situation:
Feature-branch split off master at a forkpoint, advanced by 2 commits
(commit1 and commit2) past the forkpoint; master branch advanced by 1 commit
(master1) past the forkpoint:
00c812f - master1
\
commit1 - commit2
the result is:
$ git log --graph --oneline --all
* 1c1b38e imerge 'feature-branch': automatic merge 1-2
|\
| * 8feb020 commit2
* | af7c2da imerge 'feature-branch': automatic merge 1-1
|\ \
| |/
| * acad1b5 commit1
* | 442456a master1
|/
* 00c812f _chgsignl: Add ARM implementation
Normal git log is:
$ git log -6 --format=fuller
commit 1c1b38e51c5acb5478733bcf55f61e327a594994
Merge: af7c2da 8feb020
Author: LRN
AuthorDate: Mon May 12 00:00:24 2014 +0400
Commit: LRN
CommitDate: Mon May 12 00:00:24 2014 +0400
imerge 'feature-branch': automatic merge 1-2
commit af7c2da4c1e0d8101b44ffd9827b7cdf7a3c3b5f
Merge: 442456a acad1b5
Author: LRN
AuthorDate: Mon May 12 00:00:24 2014 +0400
Commit: LRN
CommitDate: Mon May 12 00:00:24 2014 +0400
imerge 'feature-branch': automatic merge 1-1
commit 442456ae2db4a507360b09ef16881ff8300e9c3a
Author: LRN
AuthorDate: Sun May 11 18:19:21 2014 +0000
Commit: LRN
CommitDate: Sun May 11 18:19:21 2014 +0000
master1
commit 8feb0205b8a6b0500d52f86e2661bcfde2f575ed
Author: LRN
AuthorDate: Sun May 11 18:01:43 2014 +0000
Commit: LRN
CommitDate: Sun May 11 18:01:43 2014 +0000
commit2
commit acad1b5a387c795f60908734b95b7c45dff83caa
Author: LRN
AuthorDate: Sun May 11 18:01:31 2014 +0000
Commit: LRN
CommitDate: Sun May 11 18:01:31 2014 +0000
commit1
commit 00c812f1a1422e89791932d6c814acbe51c31226
Author: André Hentschel
AuthorDate: Fri May 9 21:58:25 2014 +0000
Commit: André Hentschel
CommitDate: Fri May 9 21:58:25 2014 +0000
_chgsignl: Add ARM implementation
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@6620
4407c894-4637-0410-b4f5-ada5f102cad1
- --
O< ascii ribbon - stop html email! - www.asciiribbon.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (MingW32)
iQEcBAEBAgAGBQJTb9vYAAoJEOs4Jb6SI2CwGRgH/jxSzEdnJtE5pcTUaAkcMMCk
kerglo7iKkIT2KtEV5+HXALxGTWvJwoLwnMJFw69RTLiP5BN+7OystMVPcAU2IFW
n4b9yDoaGVGeXOSI0nznFTEktSOad0r1vBfRr5RQe11O+0r0Gbl9m+xtc1O73/ab
REZbQUMbk8AkLPsnB9LU5Ja2YEQYKVmFeXI8EBcjcPGgxjNVepK3IjDfN5NQRw3h
APc4Yu2Fb/C+x+j1BIow0615wyaKwMKNvgOYjhs0abDfbroKvDiONxtb6NDjIrtE
sHgtxfLw5p67ROBIci0Ts2HXAjqcRjjnF+7CQxrOWhtIxO1oo5+r7lK5WALA3ps=
=kAst
-----END PGP SIGNATURE-----
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
