diff options
author | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
commit | 4d64875593956234795d9947ac1d225e5b110f0f (patch) | |
tree | 5cc58965cdfe27a50f86f0d8872a7da80cc7248d /libxcb/xcb-proto/HACKING | |
parent | 9837797b353b2e24e7ac96d3a74159497410c21a (diff) | |
parent | aa095d69b3874eb179cb77f033109a7f8f351041 (diff) | |
download | vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.gz vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.bz2 vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xcb-proto mesa xserver git update 15 nov 2013
Conflicts:
xorg-server/mi/mieq.c
Diffstat (limited to 'libxcb/xcb-proto/HACKING')
-rw-r--r-- | libxcb/xcb-proto/HACKING | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libxcb/xcb-proto/HACKING b/libxcb/xcb-proto/HACKING new file mode 100644 index 000000000..e954a766a --- /dev/null +++ b/libxcb/xcb-proto/HACKING @@ -0,0 +1,20 @@ +Make patches more descriptive +============================= + +By default hunk headers of a patch will look like this: + + @@ -1227,6 +1227,8 @@ authorization from the authors. + +Which is not very usefull as it doesn't give a hint where the change +happened (except for the line number). To make those hunk headers more +descriptive, i.e.: + + @@ -1227,6 +1227,8 @@ <struct name="HierarchyChange"> + +Add these 2 lines to your .git/config file: + + [diff "xcb"] + xfuncname = "(<\\b(xcb|enum|event|request|struct|union)\\b.*>)" + +For more background on this magic have a look at src/.gitattributes and +the man page gitattributes(5) chapter "Defining a custom hunk-header". |