mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: t/t3415: use && where applicable. SubmittingPatches: Document some extra tags used in commit messages
This commit is contained in:
commit
c752e7f3e8
|
@ -264,12 +264,21 @@ the change to its true author (see (2) above).
|
|||
Also notice that a real name is used in the Signed-off-by: line. Please
|
||||
don't hide your real name.
|
||||
|
||||
Some people also put extra tags at the end.
|
||||
If you like, you can put extra tags at the end:
|
||||
|
||||
"Acked-by:" says that the patch was reviewed by the person who
|
||||
is more familiar with the issues and the area the patch attempts
|
||||
to modify. "Tested-by:" says the patch was tested by the person
|
||||
and found to have the desired effect.
|
||||
1. "Reported-by:" is used to to credit someone who found the bug that
|
||||
the patch attempts to fix.
|
||||
2. "Acked-by:" says that the person who is more familiar with the area
|
||||
the patch attempts to modify liked the patch.
|
||||
3. "Reviewed-by:", unlike the other tags, can only be offered by the
|
||||
reviewer and means that she is completely satisfied that the patch
|
||||
is ready for application. It is usually offered only after a
|
||||
detailed review.
|
||||
4. "Tested-by:" is used to indicate that the person applied the patch
|
||||
and found it to have the desired effect.
|
||||
|
||||
You can also create your own tag or use one that's in common usage
|
||||
such as "Thanks-to:", "Based-on-patch-by:", or "Mentored-by:".
|
||||
|
||||
------------------------------------------------
|
||||
An ideal patch flow
|
||||
|
|
|
@ -26,7 +26,7 @@ test_auto_fixup() {
|
|||
echo 1 >file1 &&
|
||||
git add -u &&
|
||||
test_tick &&
|
||||
git commit -m "fixup! first"
|
||||
git commit -m "fixup! first" &&
|
||||
|
||||
git tag $1 &&
|
||||
test_tick &&
|
||||
|
@ -55,7 +55,7 @@ test_auto_squash() {
|
|||
echo 1 >file1 &&
|
||||
git add -u &&
|
||||
test_tick &&
|
||||
git commit -m "squash! first"
|
||||
git commit -m "squash! first" &&
|
||||
|
||||
git tag $1 &&
|
||||
test_tick &&
|
||||
|
@ -84,7 +84,7 @@ test_expect_success 'misspelled auto squash' '
|
|||
echo 1 >file1 &&
|
||||
git add -u &&
|
||||
test_tick &&
|
||||
git commit -m "squash! forst"
|
||||
git commit -m "squash! forst" &&
|
||||
git tag final-missquash &&
|
||||
test_tick &&
|
||||
git rebase --autosquash -i HEAD^^^ &&
|
||||
|
|
Loading…
Reference in a new issue