Marcin Cieslak wrote:
> I have a following stuff in git log
> (from 
> ssh://[email protected]:29418/test/mediawiki/extensions/examples):
> 
> commit 28f176ca9ca3767bfa9f0ec219f5fa0c299c5761
> Merge: e2513b6 5c50ad6
  ^^^^^^


As you can see, that is a merge commit. It was made by gerrit on behalf
of ^demon to merge commit 5c50ad6 which is change 2895.

It was merged as a follow up of e2513b6 which is change 2913 merged a
few minutes before.


> It seems that ^demon is allowed to commit without
> a "Change-Id"  Fine.

Some people are allowed to merge change in the repository. In such a
case it is not a change, but just applying a change to the repo.


It is pretty clear using git log with the --graph parameter:


*   28f176c Merge "Slight doc change as Git test"
|\
| * 5c50ad6 Slight doc change as Git test
* | e2513b6 set up new laptop
|/
*   17f028f Merge "test: little docs addition"
|\
| * 67042bb test: little docs addition
* | fc51304 Taking credit for work I did not do.
|/
* babfa18 Useful docs



You can try listing merge commits only with:

   git log --oneline  --graph --merges

And the history without merge is:

   git log --oneline  --graph --no-merges


-- 
Antoine "hashar" Musso



_______________________________________________
Wikitech-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikitech-l

Reply via email to