Compare commits
3431 Commits
Author | SHA1 | Date | |
---|---|---|---|
be08dee973 | |||
8d530c4d64 | |||
74a844a555 | |||
b6bd2d0964 | |||
e646ab9cf8 | |||
904f6e7c15 | |||
18a21c1956 | |||
2e0f3663f5 | |||
5fc31c1f81 | |||
84486b1ebe | |||
03ea3327da | |||
3ffa1ab2c8 | |||
80d1b4817a | |||
070d1084ba | |||
e6e86ed4c4 | |||
7a43c952de | |||
0e5767991b | |||
4d8002429f | |||
a2654356d4 | |||
8d45eefe3e | |||
1c1fee746e | |||
ee6ad5f4d5 | |||
8833ccd7d0 | |||
d6579d9436 | |||
cfc3e0ee4a | |||
02dad2673b | |||
dafc047369 | |||
f4d9753a89 | |||
cf2094ca63 | |||
b8367d1f01 | |||
a9400b01df | |||
153ec926b6 | |||
45733fa93f | |||
ef8b53e78c | |||
561d2b7934 | |||
3f26fe7644 | |||
4be6af6459 | |||
971f9ea543 | |||
e0eeba263c | |||
d99b4b0de2 | |||
b6f92a8563 | |||
d23871079f | |||
98c32bd889 | |||
7306b39f5a | |||
57cee8ac5f | |||
1962994f08 | |||
f7c6de0ea1 | |||
61d93a2aab | |||
f0bc854623 | |||
b9d66899a9 | |||
d8455d17af | |||
7a2c4af7a8 | |||
5fcadc3b6c | |||
689efb737a | |||
d6a2b05cbb | |||
1b7f4a3454 | |||
aab845424e | |||
f29938849a | |||
9049ba7c0f | |||
df0617bfa7 | |||
ec371ff6e3 | |||
27ea6f85be | |||
3d3caf0b78 | |||
74b6763816 | |||
ef0e938a1a | |||
ecad27cf98 | |||
8267cd11d6 | |||
441c4a4017 | |||
f54cb059b1 | |||
78f23bdf68 | |||
5015f01c12 | |||
c29edfefb6 | |||
f514ef9787 | |||
fb8880dea3 | |||
5af77d1352 | |||
9d939886db | |||
311e5ce2cc | |||
1c82039228 | |||
ae6ac8483b | |||
8136099a31 | |||
dc4e7b0244 | |||
659227be2e | |||
57a2bb1f92 | |||
c1fa16b193 | |||
d6c196abfd | |||
e654e3b574 | |||
fa6d3749ed | |||
0b2cef2805 | |||
969560bddc | |||
d11448f685 | |||
8b2707101a | |||
6c0850f2dd | |||
cbcd3dcaa8 | |||
03ea02771a | |||
1c9b659d98 | |||
7662973ea3 | |||
16ffa6443e | |||
cdd00dfe94 | |||
8f8386eeb4 | |||
83d9092f95 | |||
699a0f3748 | |||
b894d3e788 | |||
7aa67f62c7 | |||
81d0e33a22 | |||
0fb8e24234 | |||
565f575791 | |||
bb84dceb04 | |||
2953140a65 | |||
bc1c6009c6 | |||
0b20a4680b | |||
8746e30541 | |||
49c15c0e4a | |||
91d54694a4 | |||
9dd330e6ca | |||
16163602ba | |||
e95c3fb54f | |||
b21089db6a | |||
5b6211aee1 | |||
d75bb73bcf | |||
2ba6183b0b | |||
7b7c10bf5e | |||
0bb71fb36d | |||
5a4f07b322 | |||
fc9dfda1be | |||
6bea53c130 | |||
5c99995df8 | |||
1733ed3d70 | |||
ce11360467 | |||
cc75addd23 | |||
475a34451f | |||
aecce6d0ef | |||
e6837c8b43 | |||
483c9b8602 | |||
038226ebc6 | |||
9476c2c39e | |||
b8c1d27577 | |||
b80fa842ed | |||
aae42e43c4 | |||
c415fb791b | |||
c3cb7b6fec | |||
a0a50d873c | |||
99885bc0ef | |||
88329ca809 | |||
0f747f9d37 | |||
19ee29401d | |||
3a9835bf65 | |||
678c5a49ee | |||
6525496172 | |||
cfcd38f552 | |||
7205e220e8 | |||
88bd19be2f | |||
a5315dd17d | |||
74702c3825 | |||
b7d2a15b9f | |||
788f211966 | |||
629ac65f68 | |||
ed070a4007 | |||
51e83a4898 | |||
1fb5a0ea96 | |||
6262fe9ca3 | |||
486e1e1223 | |||
33f2c4ff7b | |||
52f6893d35 | |||
84deb3eac5 | |||
7a23807407 | |||
425a4c7734 | |||
13e0e28f53 | |||
8da8889a4b | |||
9b8d731995 | |||
db86e61cbb | |||
424f89f098 | |||
080cc64663 | |||
32561f5dd3 | |||
5d5be8167d | |||
1302c9f514 | |||
b590720f2c | |||
3b281d1281 | |||
3acf8dd887 | |||
1f76a10b2d | |||
e7ffa38c6e | |||
82aec45b7d | |||
82fde87ff3 | |||
2bd07065c3 | |||
667599e825 | |||
12d6ce1dba | |||
57c867efe4 | |||
25b763ba7a | |||
2aea7a51a1 | |||
9e9de18f1a | |||
12e59059ee | |||
e397e7e353 | |||
933c015e37 | |||
755c831b9f | |||
ee7589bb22 | |||
7aa9b9ba02 | |||
dc5d553b55 | |||
f04c6904dc | |||
82dee4160c | |||
c7eaf8b4c3 | |||
b130c706ec | |||
a92330d21c | |||
f225987753 | |||
9f1429df17 | |||
ebca2d4957 | |||
1269847854 | |||
8b54c23437 | |||
ff86faf2fa | |||
8f8d0ecfde | |||
011710a315 | |||
8c9155e031 | |||
51a22ce147 | |||
4bfab58ce2 | |||
8259da5ea3 | |||
824a0be6be | |||
138014c3cf | |||
034603f0a3 | |||
1d82ef5b16 | |||
d772def9c8 | |||
552a736de7 | |||
91db0091c0 | |||
b994b9bc0b | |||
223b55a577 | |||
24493ff5d8 | |||
cacee08cd2 | |||
25a294e44d | |||
f9610bcae9 | |||
d3ac359841 | |||
204ea3cad4 | |||
b083703ce3 | |||
4f66e44300 | |||
7e7ce32f7a | |||
17850efa5f | |||
5a30374a29 | |||
68c757f219 | |||
30261094b1 | |||
068c77a518 | |||
9a549d4397 | |||
87c0d08b3d | |||
b9299a2bb1 | |||
66697fe4ba | |||
a3fb31a892 | |||
f9e0952d1f | |||
027771fcb1 | |||
851e18c385 | |||
0d9f282c94 | |||
959b5455d0 | |||
3ecc7040ef | |||
73f9145fbf | |||
2e5910f276 | |||
f178136e68 | |||
4f655e22b7 | |||
d2d68d9975 | |||
11dd2b2e9a | |||
93efcad317 | |||
4d03dd18f0 | |||
e48ad1b9b1 | |||
44e02239f4 | |||
1c09276e34 | |||
2e8ef44ee5 | |||
66873d4065 | |||
e69b408280 | |||
0f2e68b54c | |||
a6926b837e | |||
01861cb7a2 | |||
54d160ec0d | |||
d835dbb91f | |||
dfed7f917e | |||
9e9033166b | |||
18a3de4214 | |||
ebebeaea0a | |||
00539cef39 | |||
284098f13f | |||
130be8eeb8 | |||
fde61a0f72 | |||
535efaf6be | |||
9ad8474b98 | |||
0188f32304 | |||
53860f0392 | |||
7aa2da6162 | |||
c1e5ca90db | |||
71cc60070f | |||
dff6f280df | |||
b5e823594c | |||
852a171018 | |||
18d8c26930 | |||
2c3aed1381 | |||
b3325dfc64 | |||
fbf2fecf50 | |||
f4c3edc0b1 | |||
3b331e9267 | |||
b02e8595e2 | |||
41af65651d | |||
f932729cc7 | |||
0ea68e4296 | |||
03f2c7731b | |||
470e28d4e1 | |||
5f8ef5b848 | |||
d6549f3655 | |||
54b418f698 | |||
07e3070d2a | |||
f5b2dec165 | |||
b21a5d6605 | |||
e3cf230324 | |||
fcd12db6af | |||
77b9b1d13a | |||
bc192300c4 | |||
f5895fd399 | |||
69ddd231fe | |||
6e122b449b | |||
f6ecc62dbf | |||
99397152a3 | |||
354ab11206 | |||
7eba6ce5c7 | |||
1a9d15db25 | |||
9c77381d6a | |||
b4fb09e4da | |||
c99a4c2db3 | |||
e54c347c1c | |||
2db69de81d | |||
3ebbd00cf3 | |||
cb5add5868 | |||
adef9561f0 | |||
92722efec0 | |||
e895986727 | |||
db2e220447 | |||
d6a31e08cd | |||
905f2036d0 | |||
578625fa91 | |||
4375c10e28 | |||
9b5fe78b34 | |||
2a01ef8ca3 | |||
2bc31d1631 | |||
160fb2b28b | |||
09bb6520d4 | |||
faacc5aa7c | |||
24ca45f64c | |||
65f9b75dfe | |||
e97a5e765d | |||
783d7e865e | |||
5e4f9cff3c | |||
c2676cde9f | |||
7ff2683253 | |||
94cd175cff | |||
336108c156 | |||
5ae41c79b8 | |||
f1cb96d687 | |||
7088f8078a | |||
6c24c5c0a5 | |||
b8803d8f8c | |||
88b291fe9d | |||
13b97ea5f0 | |||
7e35dacbe3 | |||
0cd4bcba67 | |||
f07adb62f2 | |||
257e8cecc1 | |||
9b646617b8 | |||
5d123a4017 | |||
702cbaad61 | |||
4f1b696175 | |||
ef7ee16d75 | |||
6d42ac2941 | |||
df2760a576 | |||
35bdcc59f6 | |||
84f3de28ba | |||
d23a5117f8 | |||
eb898b83f2 | |||
2d83109aab | |||
5d28cf7819 | |||
8d18550318 | |||
33388a71d2 | |||
9990080c9d | |||
8c7b1563ee | |||
240bfd2de9 | |||
32a5fcbfe9 | |||
c9e8d960b6 | |||
38a824fe05 | |||
3e20dcf367 | |||
c29807b27d | |||
11c2177f2c | |||
8c3bd9e288 | |||
73c2779f42 | |||
260eec2927 | |||
3ff53df7b4 | |||
ae25fd39bc | |||
4a6ada32cb | |||
cb46d630ba | |||
efc8a625e9 | |||
eb67052b13 | |||
12b7eda44e | |||
8d3981ccbe | |||
7a06e63f82 | |||
0baebca51e | |||
0c54706528 | |||
c12401705c | |||
b6d323f164 | |||
8348bf1b69 | |||
d939af12bd | |||
980a3d3dd7 | |||
461c119739 | |||
8e699cdb9f | |||
c0b901eaf7 | |||
2bf2d819e1 | |||
3ecca8879a | |||
85df7cd487 | |||
c0d503433f | |||
3a760cad79 | |||
720e20eb68 | |||
2dded96052 | |||
178d2c7a7f | |||
d2c3464fef | |||
b2f44feba5 | |||
be9cb560e3 | |||
5f02274e4c | |||
0b9ce18ede | |||
9f56db7caf | |||
8f50e2eef7 | |||
81bc521af2 | |||
a3f4eb1b40 | |||
54d673f25d | |||
e12b51e4d6 | |||
ba12cb299f | |||
e7cf4b2571 | |||
7ebc8cbedd | |||
31a0ad5456 | |||
e88b8586bf | |||
8545932d45 | |||
29dce32f79 | |||
de67af4a8f | |||
44737c4228 | |||
c36e465aca | |||
0533a9b70c | |||
a94594dcf7 | |||
1958a6eb54 | |||
14de7fba34 | |||
c95b758587 | |||
bbdf0acc7d | |||
7687252f3f | |||
d96a53996b | |||
f3a977187e | |||
74ec19d4be | |||
266b18273a | |||
2036cb98d0 | |||
45abdee662 | |||
22d6857d46 | |||
55a16ee487 | |||
14691e3827 | |||
bc598c32ae | |||
5f65499fa2 | |||
e286542de0 | |||
c26f7d7b26 | |||
52fca2184d | |||
8cc88166c0 | |||
1c601af25a | |||
dd7961c0fb | |||
e810f93977 | |||
fd8c620cd9 | |||
cc118a65b4 | |||
d0ab058498 | |||
86b601c5d8 | |||
da4c5adae9 | |||
dbd6cced19 | |||
a17c56c056 | |||
7a2c87b152 | |||
ca00f80b58 | |||
caac7a3abe | |||
ff132a190e | |||
3afcec9057 | |||
315b3ba3e4 | |||
bde6a72af5 | |||
c18593658e | |||
342c14db8c | |||
3b175fb940 | |||
6f402a93ce | |||
726359be47 | |||
aa0b816c5d | |||
7c696007ca | |||
3f8b439a0e | |||
de62fe8c42 | |||
cd377f45c9 | |||
53a8555ee4 | |||
53438e8fe2 | |||
f25b98e6f8 | |||
6f9504c48e | |||
15dc5b5fb0 | |||
5f5f553fd5 | |||
e7aac44ed2 | |||
69f9c87d46 | |||
b112b14d78 | |||
53c76dc05e | |||
d830d395a1 | |||
f99a38c012 | |||
89dea97334 | |||
144c76fa39 | |||
0f2a71d992 | |||
afcb2e7a3b | |||
abd0cd3a30 | |||
4e2bef57c9 | |||
a4c653dfcd | |||
7d782416cb | |||
c5918ab450 | |||
83d3330dec | |||
e4f031e34b | |||
dd160d794f | |||
6bfab998b5 | |||
272be14a85 | |||
1c56190aec | |||
ed197a6ab9 | |||
7f44e3d1de | |||
f7c9dac1b0 | |||
80a0548f6c | |||
ae2a38271f | |||
c2842439a3 | |||
5c942570fe | |||
ab0b2c53ed | |||
5dd6e234a7 | |||
eef005dcb3 | |||
cd2f471311 | |||
ed89f84b3c | |||
746bbdc64f | |||
33aef83666 | |||
39e69e1519 | |||
4341460d92 | |||
4e07815dba | |||
aaad2c948f | |||
e13d37094e | |||
c265c533cf | |||
114ff8881a | |||
b07244f4c3 | |||
fe819b4b73 | |||
2e73ab6e69 | |||
bc483285b7 | |||
cdab3cacf6 | |||
5b05b92d03 | |||
0f62fbae65 | |||
bf72ac17d7 | |||
3ef4446bf2 | |||
3bc6686b86 | |||
f26bdf2d98 | |||
9e2a113db9 | |||
60ff7f9f5c | |||
b4967ab490 | |||
528484c645 | |||
ab156128fa | |||
100e433741 | |||
fbdeabf1f0 | |||
4d9f744e34 | |||
1eaca7a5bb | |||
18b22dbed8 | |||
4d5a3c5884 | |||
01d597feec | |||
6003e7f93a | |||
bb3e7b1a55 | |||
abecddea25 | |||
b7abfacf5e | |||
51d5980ea0 | |||
3f20927717 | |||
71a8af60ae | |||
a15ebbc2c7 | |||
e9da4e6ff2 | |||
eca143b721 | |||
697f67ac9f | |||
ada9ecd989 | |||
7c621186ba | |||
93eba05b4f | |||
f1e80c0829 | |||
619b8f8636 | |||
2d893dff4c | |||
5bb01d4f02 | |||
e557179a63 | |||
297230d490 | |||
be67fb4fc9 | |||
9ce8613349 | |||
a3e55f72ba | |||
21f637378d | |||
a4156d2034 | |||
961abca02c | |||
01977f46cb | |||
799767cc98 | |||
7783eb2e59 | |||
721f5bb896 | |||
313f52334b | |||
d790ba92cc | |||
6cf7eef384 | |||
43f23b09bf | |||
e01787f1a1 | |||
0e521a41b5 | |||
acf7189512 | |||
0df3245721 | |||
3f4f17b51b | |||
c925fe2368 | |||
f30301657b | |||
e59f6c2d34 | |||
8413a79e67 | |||
1f9e0a5348 | |||
a745a58ade | |||
b3a30f6e0c | |||
ace6325ddf | |||
3cbb92054b | |||
615eb98a83 | |||
64fe6fcd9e | |||
e12fc40a15 | |||
bbddc51664 | |||
89bf01361e | |||
35813042ef | |||
c07173f215 | |||
0bf46af089 | |||
7e837c6477 | |||
076c98372e | |||
3096b2ecdb | |||
60d708b220 | |||
262ea4a6c0 | |||
43d2401456 | |||
121f7b0509 | |||
fa5b1aa9a1 | |||
b1c8a11c80 | |||
1fe9703f08 | |||
8d314d7afe | |||
0d1a151783 | |||
1eb07d829f | |||
8528bf4b89 | |||
592e412d0f | |||
84e6fb9da9 | |||
0f4af3b9ea | |||
f5682b2a86 | |||
0ca560cb97 | |||
b979d95027 | |||
f194b1ef6e | |||
cbdf60fa18 | |||
39ecb27436 | |||
f43254440d | |||
fc56361f58 | |||
bdf0f375b9 | |||
338dfd0da4 | |||
3c3e7f5b57 | |||
9559ce8368 | |||
c990a4c11d | |||
9645459756 | |||
a8ba5dd7b1 | |||
af189b4cbe | |||
6d3824cf92 | |||
93a36493e2 | |||
4f09825e58 | |||
5c31464874 | |||
83fe16703e | |||
8482d042a0 | |||
5bdb7a78ad | |||
7aea43ff4e | |||
781d93067d | |||
6c8afe495b | |||
124b51909d | |||
7363e66904 | |||
1976f9b527 | |||
3a59e5954e | |||
b1ffafa978 | |||
cbed29f37b | |||
58eb0122f3 | |||
d70bc3b97a | |||
15b3f71148 | |||
a225a26010 | |||
c8a70d3509 | |||
ae454f6125 | |||
28c7b1f7b7 | |||
75d2e5a7b0 | |||
7b0580583a | |||
804098bb30 | |||
3707995960 | |||
c9266d5894 | |||
c46e27aa77 | |||
193d716011 | |||
b5e112d8d2 | |||
d4cf11c2e9 | |||
f6f79e5ee3 | |||
62089fb8e9 | |||
df25e9475b | |||
05eb563553 | |||
7a64592cf8 | |||
43f9d9f3a6 | |||
0e0aff4b4c | |||
d17ec3a9da | |||
aa1462cc3d | |||
a5481a6c94 | |||
b7c1e11dc4 | |||
5841520b03 | |||
ae40ebda9b | |||
df0b6cfbda | |||
cda2ef6470 | |||
912bd497e9 | |||
84d18c0bcf | |||
e1f7037167 | |||
a7ec9810be | |||
bd8202f3ac | |||
64f23b0c20 | |||
5330e6e270 | |||
2df5a846d0 | |||
d95138e695 | |||
c9493973a5 | |||
3115ee45c8 | |||
38ae878407 | |||
351d06df51 | |||
b1f0802e91 | |||
7ecec52d42 | |||
c82b6d3f4b | |||
5416f8af0f | |||
a6a1ad9b25 | |||
0df0541bf1 | |||
ebf4fc90da | |||
5fd72277d4 | |||
68538cf954 | |||
f2bd231414 | |||
6356003c80 | |||
6998d890c7 | |||
c5baf18a40 | |||
c53312583b | |||
f249409b6b | |||
b5496cbd22 | |||
16272c7db4 | |||
e2c6f7cd5a | |||
df97e5dfea | |||
bfb539bb73 | |||
3072ec397c | |||
b3689ce31c | |||
b79bbed185 | |||
61461791be | |||
07528be101 | |||
712b351bd3 | |||
c595cb9c4f | |||
9d71c5f408 | |||
54a17cdb9c | |||
ce5e33832a | |||
6f59058e49 | |||
8f61ccf15d | |||
510ab3f3c1 | |||
5d24b109a6 | |||
4b64c8a1ee | |||
49ac7358da | |||
6da9f888da | |||
3c84c38dac | |||
a1eaf8655d | |||
20d16da5ca | |||
de04706e31 | |||
8c17d5a3c0 | |||
59c465d5c0 | |||
1335f73289 | |||
cd94c6f91e | |||
02976bf856 | |||
2becf00ff7 | |||
4b55b9b479 | |||
f27d05b170 | |||
efaba7cc77 | |||
f50c440730 | |||
70a4ae73d8 | |||
7d7d5b0568 | |||
c9ad147f83 | |||
b3584761eb | |||
e6826e335a | |||
71ab8fa840 | |||
5d477a334a | |||
0282f4dced | |||
f6216c2c5c | |||
78cc1a540b | |||
edc8f710c7 | |||
d417c244ec | |||
41208825a8 | |||
2a514ed805 | |||
81a48cc080 | |||
6a951937ae | |||
44b877e9bc | |||
82330950d9 | |||
fc4937c372 | |||
bfd155943e | |||
ad42f28d0c | |||
b4d6280e2f | |||
f813e9ea5f | |||
e18443ece7 | |||
aeff29dd4d | |||
ca194d50b8 | |||
434060ec6d | |||
8e98e5f27a | |||
a4cc18f293 | |||
d66aeff21e | |||
1c03c4d347 | |||
e2991c8048 | |||
a1c9eb918b | |||
4eaa4bd800 | |||
243371023e | |||
fb58c8d507 | |||
e426ff4222 | |||
fb802b3129 | |||
0a4b24ff14 | |||
58f233ce1e | |||
79e4d8a9b8 | |||
a087b432a7 | |||
a122366d69 | |||
7fa7dc8904 | |||
5d97861b9b | |||
98ffd5ff67 | |||
fc67a0825c | |||
b4c4af832b | |||
fc1c21689d | |||
f417eed8cd | |||
c99ba492f1 | |||
22410549fc | |||
f67986b909 | |||
b1456605c2 | |||
b7b314711a | |||
8944969c20 | |||
81dbd768db | |||
1678b81ecc | |||
41fca0989e | |||
49ec402d52 | |||
fe911b8ca0 | |||
4a4cf9e821 | |||
a9de989754 | |||
44c175c7a4 | |||
a32975f516 | |||
5b1d901c01 | |||
d5c1b7c286 | |||
e479c5f8f3 | |||
c4ac525c84 | |||
ca92a660bf | |||
eb86a507a1 | |||
16da57c7c6 | |||
5c040f5af5 | |||
f09bd215cd | |||
37d6f933df | |||
0d9388dc30 | |||
6de4c80839 | |||
6588f82ff6 | |||
afd647c55f | |||
dfb67594e9 | |||
2cd8ebdd3d | |||
6b2c0ead06 | |||
b76b4cd4f1 | |||
070d276cc1 | |||
659d4c8fb2 | |||
4be33f7222 | |||
335f1a7eb2 | |||
c3b1c1e9b2 | |||
486b51bc81 | |||
0d5d7db435 | |||
103b6f9c2b | |||
c7ca4424ea | |||
412e63f0fd | |||
323598387d | |||
25f600e142 | |||
d6d1a75e51 | |||
f3612acb93 | |||
0179ca7a62 | |||
f49a5650ab | |||
91479b9c72 | |||
921bdd96af | |||
19376104a8 | |||
11b6d17801 | |||
2a747902c3 | |||
f2c5baa14e | |||
1e1ea69fa4 | |||
85b343245b | |||
ffad85c599 | |||
6b3ee18dc5 | |||
9f0aa6e654 | |||
e9dfe253fd | |||
fcceef4e06 | |||
ab680dce2b | |||
69b1cf91e5 | |||
73079d21ec | |||
277b915715 | |||
8e33678a26 | |||
215b565126 | |||
5879232090 | |||
fc80edcae1 | |||
ed01e206ba | |||
16cf51c7a2 | |||
2c185f0476 | |||
c54c7b376d | |||
58d121b22b | |||
e1c1ab9d25 | |||
329af6ca7d | |||
a9845c5f50 | |||
47a1657ab9 | |||
872b1f26b8 | |||
39f9819931 | |||
a5fe66802f | |||
e356158b4a | |||
43262d8d65 | |||
0e04b248b5 | |||
c491e9e456 | |||
7df5c978d5 | |||
dee47925c1 | |||
8f436d1374 | |||
829f03e98c | |||
db65170ee5 | |||
82b416e063 | |||
709cd912d4 | |||
ab7fade919 | |||
d614f07549 | |||
1051ef0063 | |||
eceafffbec | |||
a93bedada8 | |||
0eeb077be7 | |||
fbfa0973fa | |||
0b1f688bf4 | |||
6ea3b67b4e | |||
e06764c8eb | |||
20c3fe7621 | |||
f8da6801e2 | |||
2c970c9ec3 | |||
88d5072466 | |||
1daaddd1d3 | |||
19bf6c9b34 | |||
d66ae59b8a | |||
501cf47cdd | |||
ffcc9ba763 | |||
6ba9e2c1ba | |||
755113b903 | |||
72dbb36554 | |||
e654eb29ab | |||
30f8160d26 | |||
a8a17756bb | |||
2024d31765 | |||
1e9676ec0a | |||
7974889a05 | |||
69f9a6e54a | |||
f1673dc474 | |||
9fb0a798a7 | |||
5455ee0573 | |||
c4a8354bc1 | |||
cbac7067a4 | |||
c538004ccb | |||
e41f8d98e3 | |||
48feda5873 | |||
5c2e65497b | |||
4cb9fe35c0 | |||
7e46f27fa6 | |||
0662990144 | |||
7c1ff53d5f | |||
413a715f18 | |||
96b7f93ac8 | |||
51f319c08f | |||
7c997bcbf6 | |||
4ba8846208 | |||
5efef305d8 | |||
5e896a37c7 | |||
e9f767ecee | |||
2d8bb4685c | |||
c7b4de2cc5 | |||
8d5ef5a0d1 | |||
a3821a1ae5 | |||
3c91e9966a | |||
1d93ec9397 | |||
bdf204f28d | |||
d9c82fa7a7 | |||
ef45bb1f81 | |||
d96a275b91 | |||
8c8884ce97 | |||
1164db977e | |||
f0e7f11d05 | |||
f5517074f8 | |||
96658060d7 | |||
4e3687858e | |||
34b935c01f | |||
414382fb00 | |||
055c7e9fc6 | |||
e3b601da2a | |||
eb2a8d9ed3 | |||
2c9c1c5178 | |||
8afc493d11 | |||
c3e23dc117 | |||
9b7a61d7da | |||
86b898487a | |||
6be0264030 | |||
514554cf53 | |||
2532dd0605 | |||
020be85f51 | |||
09f1157bbf | |||
22e3b46ff9 | |||
2cdaabb6f9 | |||
818a2d7722 | |||
5c3494ed88 | |||
8b504db309 | |||
f86f31ab33 | |||
3dc5ce0a56 | |||
a6be52e239 | |||
a9d3493380 | |||
6dec263333 | |||
abcbafedbf | |||
67f0b6f3b2 | |||
4ba5bb5531 | |||
f693bb0bb0 | |||
324a9f41cb | |||
1fd63cac50 | |||
152722f155 | |||
6e0ac8e45f | |||
777e75b605 | |||
f93a393787 | |||
ad6e8ed37b | |||
ce4e7b2ac3 | |||
daf7d86783 | |||
9cc2b07a7c | |||
956352b67e | |||
e6a268c534 | |||
fada767463 | |||
7c37a5dc82 | |||
a2d25ef07f | |||
e25c7cc146 | |||
80ea984da6 | |||
5504f13a7c | |||
fa14ee77ac | |||
9570d67c00 | |||
9f992262fb | |||
05438afca7 | |||
ec48a76306 | |||
fc0aa395f3 | |||
9ca0aaf6de | |||
0e8771f198 | |||
1570856b51 | |||
3a1b3126ed | |||
a1293ef7c3 | |||
f5f53f1410 | |||
c2e0a718c6 | |||
000f0da57a | |||
33ffc176d6 | |||
8dbf3eb685 | |||
74b15bfbf6 | |||
77bd3ea9f5 | |||
fa73a582b5 | |||
587089c195 | |||
3169e06daf | |||
f41d632970 | |||
a5e2499e54 | |||
14f8b9b494 | |||
8ade009c95 | |||
b8767f791c | |||
0e383e185a | |||
fae46aa0ae | |||
9eabf5b536 | |||
df08eb357d | |||
1e6c8babf8 | |||
5d53433864 | |||
23903b9e29 | |||
a2e5c79c69 | |||
6fd58363a4 | |||
cb9ec8e23e | |||
af6d7a6231 | |||
4ebdeb68ba | |||
38ccaf93bb | |||
a26d48a46e | |||
22a1ae6ef2 | |||
14230580af | |||
c37d7b50f3 | |||
f3b5b07c3c | |||
0ad782f240 | |||
d55ef3e044 | |||
636614f337 | |||
7419a03fdb | |||
6bc0cb5176 | |||
5cb901a4b0 | |||
4e675d1732 | |||
0a0c953217 | |||
c38cd1c89d | |||
b1b49c6eb6 | |||
6e20a51a80 | |||
f8ee4d8522 | |||
c50fb6cee6 | |||
b4ebaf9eea | |||
21758affae | |||
363e98bfc2 | |||
e45a4949a2 | |||
7dabd05634 | |||
1700cb3b05 | |||
f31ba7e116 | |||
7290ef5898 | |||
580b04ef98 | |||
9c5fe0b846 | |||
e2b0bcdf4a | |||
a89caf4bd4 | |||
00530834fb | |||
455ade6598 | |||
635170f2bb | |||
fd95035fdb | |||
3d79f65735 | |||
f124b73023 | |||
5f9cf5abd2 | |||
f72f542107 | |||
91d6e94ea6 | |||
6c4461e8d9 | |||
a0cde90ebf | |||
f0a011fa1f | |||
635b99a0c7 | |||
96062b5762 | |||
d1516bf462 | |||
7a456c1eea | |||
2e253a4a12 | |||
a00595fbd2 | |||
d70d7a8a4d | |||
53dc95b5cf | |||
e26cdf91c1 | |||
45690a57a3 | |||
5bcad1bce2 | |||
ce2a987329 | |||
d155254c73 | |||
73868486f0 | |||
30a3fd4050 | |||
0e0b7de4c7 | |||
99a2cfbfe6 | |||
fcb615f51f | |||
a55ce97185 | |||
eed2514802 | |||
a217dcbd1e | |||
e23b036863 | |||
2b2a5be394 | |||
8353847e85 | |||
2dade7a7b2 | |||
9afbb2dc37 | |||
68ee628932 | |||
7199c093ad | |||
862e730ec1 | |||
9532ead987 | |||
e4b4e7d704 | |||
ce6ab232ca | |||
17e785f6ba | |||
ddaf4e2e9a | |||
5bf66689d5 | |||
cc77b99612 | |||
fb257bfa17 | |||
29b2041c2a | |||
935d937644 | |||
faa4b2ecbb | |||
91c90876de | |||
fd707807f0 | |||
d1caa58954 | |||
c24e0e7751 | |||
236794f1eb | |||
7928eae1dd | |||
44fa796793 | |||
39fa79178f | |||
b54301bdad | |||
8087a62086 | |||
6263f58f86 | |||
823ac2b633 | |||
086d0d4ab6 | |||
29bc88505f | |||
3dbe9db01b | |||
adfe5d0434 | |||
48c58471c2 | |||
a1ad0eb0cb | |||
e291c75a95 | |||
979cb245e2 | |||
1ca41a1932 | |||
d201a1ecdb | |||
bbf431c9ae | |||
141ff8f9e7 | |||
b12d3e904d | |||
1d968ca698 | |||
bc0a474149 | |||
224147704a | |||
2f5b4950b9 | |||
527ec3980b | |||
413f50b901 | |||
11c6659d85 | |||
3a429d0af3 | |||
a9f9f8cc1f | |||
8770e6fbb2 | |||
da66b2743c | |||
f052154db3 | |||
9e3751d443 | |||
ee2499fe38 | |||
92de92172d | |||
22570b68e3 | |||
5cd83e1885 | |||
dbe44faadb | |||
5ba28313f2 | |||
d6cc2df5c8 | |||
122d53464b | |||
c4ec96774b | |||
275721c267 | |||
3e4f2373b2 | |||
719518f5ce | |||
cc969c8dc1 | |||
0c4dd67a04 | |||
5c2a581dc9 | |||
00b7cbfcb3 | |||
6c1249c503 | |||
4295abc040 | |||
3b7d373ae2 | |||
949d16795c | |||
bcd1ecd08a | |||
eae0216646 | |||
072f391c53 | |||
7a4f891329 | |||
da3d507ce0 | |||
3e199decd5 | |||
05c39674f3 | |||
1645dbeff7 | |||
20cf8b548e | |||
d0c692263f | |||
a4fb76ce19 | |||
599dc766e8 | |||
822f0c4ff7 | |||
66d2e04ec9 | |||
838d6a928f | |||
d89df367f6 | |||
db9bb280ed | |||
eb8dc05c3d | |||
5061a44bcc | |||
d12f455e44 | |||
c998b38147 | |||
f6a1e1e288 | |||
3890dae970 | |||
4667391958 | |||
d017a450ed | |||
9c11578b00 | |||
cbdf203f88 | |||
5ee1c99ad1 | |||
0deb5c9721 | |||
9922c5a334 | |||
427cf16985 | |||
ef87a4801a | |||
7253a02348 | |||
f4ab4f3ab1 | |||
044b6a9efe | |||
0544574cdc | |||
19d122bf1b | |||
d0258b93e6 | |||
1ea28e1494 | |||
aaa7e0d7f8 | |||
a379f25462 | |||
071e93a148 | |||
36ec67d1ea | |||
c1c4a878bb | |||
21b56b9259 | |||
8a1d89745d | |||
ebb464f0cb | |||
a60abe10f2 | |||
429ad20413 | |||
76c61fbdba | |||
d595bdc17f | |||
4538a88256 | |||
1c262bb7b2 | |||
0a3ca9c011 | |||
a367b8699d | |||
5a8a19e903 | |||
b50bfb8fd5 | |||
e08bc7a9ec | |||
ad3967a5a2 | |||
185ce3a98c | |||
cf018ee0cd | |||
cbf50f9e3d | |||
61e51e0000 | |||
ba43b7f29c | |||
ad4cd6c297 | |||
e6fd3c6730 | |||
fc38a9bb4d | |||
d415ad022d | |||
4ec6591dd7 | |||
6c34492ab4 | |||
805cf6e938 | |||
4da50def5b | |||
29957fda0b | |||
38e50e81e3 | |||
1d455231a0 | |||
71ad0505cc | |||
cb64800d83 | |||
12bdc880c7 | |||
e8f9e42829 | |||
975e382d13 | |||
c518059b26 | |||
c99fec6e35 | |||
9a3d637541 | |||
811ce1b47c | |||
cd0120857b | |||
1add9aed85 | |||
13ec221d8c | |||
22aca1b3ac | |||
558e5a8c40 | |||
7cb5073fca | |||
051086b947 | |||
b9f5d3874f | |||
5c38a1fad7 | |||
465868a225 | |||
02f8203740 | |||
9e4d2f6d45 | |||
a0c0c2e5c2 | |||
5fa9e4c4f1 | |||
1efadd79d6 | |||
ee2309dfe2 | |||
352618287e | |||
0495983679 | |||
331fe94fed | |||
7e98292653 | |||
120c585b22 | |||
789e98df82 | |||
eb10a85098 | |||
84e55dcb34 | |||
6cc983d0ad | |||
66ff763ebb | |||
cedeffeee0 | |||
68a2e6a2c8 | |||
17c7f4d8e4 | |||
c628edfddb | |||
3553944aa8 | |||
cbaabcbc6f | |||
abeef9c856 | |||
5b2d8d6f21 | |||
4a32b2e08b | |||
1146f17e2c | |||
5baf37d383 | |||
e911104c84 | |||
07f9c881d6 | |||
61da596992 | |||
521331cc9f | |||
385e8af5a2 | |||
8bfac19ab4 | |||
6075f3076e | |||
9ef6eaa287 | |||
49e818762a | |||
433efcad9d | |||
1238ac8c5d | |||
5322b837af | |||
bf990a29a0 | |||
2ded109b51 | |||
f6f2a9e42d | |||
7886cfa080 | |||
6ccc71a9d0 | |||
309a9e3373 | |||
c9d441a899 | |||
a074aa90a8 | |||
3e370f9faf | |||
39e4ae3880 | |||
b48158ac94 | |||
46f034483e | |||
ccd593cffa | |||
846e5dfbab | |||
509adc3352 | |||
e682c9db1a | |||
64ab71db3a | |||
2845ce7ff1 | |||
2527bbce25 | |||
ea19289bc8 | |||
8440f74997 | |||
e3b199aef1 | |||
6749850769 | |||
64c9e02765 | |||
2e1dfd62dc | |||
39a5d50d62 | |||
ef8163ce57 | |||
67e5a00d0a | |||
1156097296 | |||
b9032b284f | |||
a9d00b662f | |||
e971a1f9d5 | |||
7502b230ce | |||
b02a94d663 | |||
8ff1ddd717 | |||
03761c922b | |||
a916cb5fb4 | |||
89c855ed3c | |||
d358f771e3 | |||
d7a643b73f | |||
1427a7ff70 | |||
383c3427af | |||
0c3db67cc8 | |||
95d621217a | |||
83115ac4a8 | |||
ce41720cad | |||
af16bdaa3f | |||
110062a134 | |||
e41bf352e3 | |||
28fcc0b71a | |||
4bf256d67a | |||
eb859df85e | |||
009409fe72 | |||
3d4a3ffe64 | |||
d45366e8aa | |||
74e8bc59cb | |||
770380156d | |||
1cf32f4d54 | |||
52fecab20c | |||
018b3fbc7e | |||
34349dbff8 | |||
0b10b8a3d5 | |||
1016658de3 | |||
eaa4e59c85 | |||
1faac1cedc | |||
7ad39a2784 | |||
5569113329 | |||
00c7e7e7e8 | |||
9e62316df7 | |||
df0620108b | |||
8cbc57ca11 | |||
92b269f5c5 | |||
f84df81f65 | |||
baaf233755 | |||
d1018c2494 | |||
37ee646e72 | |||
d93d5d51e3 | |||
0ab00b9464 | |||
3f5872603d | |||
b7990520bc | |||
5b9496768f | |||
e80967b287 | |||
896e700ad9 | |||
22946a9426 | |||
36bf6d4697 | |||
fb3e7d5515 | |||
16018ae5fb | |||
ad34ad614d | |||
89ba311df3 | |||
631f6f1d47 | |||
9a35c14d64 | |||
8eeab92f02 | |||
9c589d971e | |||
6eb1401375 | |||
2eac0356b0 | |||
37f4bed11b | |||
64f7a26494 | |||
cd88410618 | |||
099d2d86a8 | |||
564705c7f0 | |||
a0b4507ef7 | |||
ed178ef13a | |||
88bab59c5b | |||
f2f3fc9547 | |||
591707a736 | |||
fb896362cc | |||
ba63bfaa59 | |||
d544696afa | |||
d3115a35fc | |||
42b2f894a0 | |||
1c30f8efa4 | |||
c809f4258f | |||
c84364abe3 | |||
e8281f0164 | |||
2e0aabe602 | |||
e9ab76da8f | |||
ef05a39fa0 | |||
7c597ef345 | |||
7ff140202a | |||
9718c7c0c2 | |||
a59ac46ba4 | |||
268d5bc2b2 | |||
6b1258b07b | |||
1154aa4215 | |||
ee1c6c34ac | |||
b5f52f372e | |||
1385bb7ba3 | |||
96b2d54aee | |||
0269f968b7 | |||
d349e0ee60 | |||
1eb0545cce | |||
64f2589a09 | |||
c6458e60ed | |||
d6d6673e66 | |||
ad295bbca2 | |||
4498b3a50a | |||
5a5c11f19d | |||
de18648212 | |||
b6e8a3b540 | |||
b7994af0f9 | |||
7e11052442 | |||
7348cdeb6c | |||
7e9e048661 | |||
798a5b03fb | |||
470b11e805 | |||
1bf01040f0 | |||
416145f07a | |||
de248e92c1 | |||
27547e5fcc | |||
599446dc32 | |||
dde843e737 | |||
cb0abea870 | |||
245e1c196d | |||
a337292675 | |||
03afcbee9b | |||
0cc30e0e84 | |||
f80c153bea | |||
fec501dae8 | |||
260d408e32 | |||
82912d1de8 | |||
f43cce23ad | |||
3446a59b39 | |||
3d6bc9a763 | |||
9a9a41db83 | |||
85cb8906f0 | |||
f6e6362107 | |||
7fcec48da9 | |||
e46fe3df01 | |||
7a1aa0c288 | |||
3cdff83fb0 | |||
f8e593e9a7 | |||
fa9aaa8f10 | |||
d2ae751b1c | |||
0cb7054e75 | |||
011cb58bfb | |||
bf2cfcaabf | |||
03571fda77 | |||
5a69705968 | |||
1d058dc6e5 | |||
638cbf5f0f | |||
6c3b2afe6f | |||
5dcd1b1577 | |||
852ff1c362 | |||
f86a3747ab | |||
f1f4c84dcc | |||
ecc46a1780 | |||
6b6c5f7a2f | |||
44cc742a8c | |||
689664ae94 | |||
c888305e1e | |||
f88c11346c | |||
9386878f69 | |||
157c8e3ddf | |||
c47f86c56a | |||
0013251fe2 | |||
ddc7d46d9e | |||
8d00662d7d | |||
34a0dbfc6b | |||
d077c2db8d | |||
2cce675a63 | |||
fa54b52432 | |||
9af95af05f | |||
a4acd09bd9 | |||
44f518e68e | |||
6eebb35ec0 | |||
bfcfc7d273 | |||
fc792ca860 | |||
2bf15a3330 | |||
6ae0d97266 | |||
3c6151dad3 | |||
84ccad8dec | |||
afcb6ee30a | |||
c8b8f22aa9 | |||
918de7523d | |||
668fa6c951 | |||
1c8f034ddb | |||
c9f0dbf143 | |||
2b8bd44aab | |||
1a51b52422 | |||
9585cb8d96 | |||
cf8a8c6bd5 | |||
52735a6892 | |||
ad00aebfe9 | |||
ab0fb57aac | |||
a78fc4af82 | |||
d7bfb9ee97 | |||
9ce4ad3e0e | |||
539d09c3b4 | |||
562bc08093 | |||
c8c3f1d087 | |||
0e32d4b31f | |||
05bfc7dcaa | |||
f907282faf | |||
319b678a7b | |||
02507f42a0 | |||
814ff3141e | |||
d0cec149b2 | |||
d50d31e880 | |||
7298ca7b2e | |||
d3c0811467 | |||
d03ead9836 | |||
a3b75b3ccb | |||
9e4ab3a4f5 | |||
31137f54db | |||
3a183520b2 | |||
2c97724d5e | |||
4eea8e3fa0 | |||
a070d621ed | |||
b265061937 | |||
2217579cde | |||
245dd15aa9 | |||
b70cec0a2e | |||
a5d3154854 | |||
73d8bfde32 | |||
591a1daa7c | |||
07e3f27f48 | |||
9f389aa492 | |||
b37996e251 | |||
cf98c423b5 | |||
39d5bef5c1 | |||
138ce9c29f | |||
83e085a1f9 | |||
283cd320db | |||
553c622b68 | |||
d8279c7d85 | |||
a730ea3c3a | |||
792c57273f | |||
90329592b9 | |||
76f92c1684 | |||
dc76d8fec9 | |||
c12468b71c | |||
c2ea120885 | |||
6b17eada5f | |||
0615173998 | |||
129260cbd4 | |||
2dfb2e07cb | |||
30db51a3fe | |||
55a3b3c26e | |||
574ee8ae86 | |||
fddfaf8a22 | |||
c9e1f2c7f2 | |||
efee5981d3 | |||
bca181109d | |||
6ce3cc5d33 | |||
ea1fd481b4 | |||
d78374e578 | |||
05e816e37f | |||
a801bb8c29 | |||
2f6ef71387 | |||
927936d753 | |||
cf07d3fe90 | |||
dbd04eba01 | |||
257b204f25 | |||
01c057df3f | |||
09e32fa0f8 | |||
5f15cba2f9 | |||
fc99da1fb7 | |||
be86fb3f8d | |||
c6587bddc4 | |||
e6821d09e4 | |||
76e057dba2 | |||
6636cf7e90 | |||
fd7771415b | |||
ecb590a9de | |||
92e625d3a3 | |||
777c55a616 | |||
826aed50cb | |||
466e8d5d66 | |||
7e314539d6 | |||
44b228985e | |||
cb2c2796e0 | |||
70320541ec | |||
d95d728aba | |||
f53fc38c08 | |||
9b22801c18 | |||
c267a4d013 | |||
61ca378275 | |||
aa65b86025 | |||
07da4e092f | |||
c12eca7ed2 | |||
a633651d21 | |||
3a52578eef | |||
437ed4cea1 | |||
a393c6bfd9 | |||
a4f287e5aa | |||
7d6f6e3730 | |||
ffac6258de | |||
3f6f5c9dbe | |||
c97418466a | |||
84a37fae51 | |||
82b6e331a4 | |||
f63ed085e2 | |||
8c2ea51254 | |||
915e44c635 | |||
067178ed8a | |||
5d0b9bf86d | |||
e280888cfb | |||
473091e21e | |||
d687839c29 | |||
f0b1f1ece7 | |||
f088104490 | |||
c29b3962af | |||
c5eadcaab1 | |||
1d4974c9bc | |||
5c950e9bf0 | |||
911ec99b68 | |||
260d5850ad | |||
d56d966b3b | |||
9a9592ff7c | |||
1b7cb8969c | |||
2d9426b049 | |||
65e6758767 | |||
03f15a79a9 | |||
e80e85a52a | |||
46d403f13e | |||
5f456b3c26 | |||
cfe96b38fd | |||
daea6fca35 | |||
4c24385e80 | |||
0a81977239 | |||
551fc7aec1 | |||
ec0465ade8 | |||
89ebf97c11 | |||
38f6ae90de | |||
d6c988ddfa | |||
f57610a1ff | |||
ea56c4e02f | |||
8d42299361 | |||
ff4056bbc3 | |||
49672f26d9 | |||
8b43fb18f8 | |||
e869c5eaee | |||
49383dd431 | |||
b7a06e006e | |||
8bafd20fd9 | |||
635ce72fae | |||
11f228b0be | |||
bfe998fc9b | |||
545871bf77 | |||
e7d053ddb9 | |||
2f69de5b4b | |||
95508a0751 | |||
9157c5cb09 | |||
e4e6e8b4e3 | |||
d8cd32792a | |||
807e3cac46 | |||
aef591a0f9 | |||
27a6625b13 | |||
53350a35a3 | |||
9ddc5ac97e | |||
c21fc9d0ab | |||
35da1bf5d6 | |||
a6a4a88af0 | |||
0a5e3c50de | |||
a167ece0c8 | |||
5ca812a19c | |||
99094a7ad4 | |||
60687de5ba | |||
8fb268720e | |||
bb79af9d09 | |||
f88851c637 | |||
32d0462f8d | |||
626df76e3d | |||
c3c17bf107 | |||
b7916422c7 | |||
270f0a8cb2 | |||
16eff6c009 | |||
ee0e38727f | |||
599d223107 | |||
c2048f0b39 | |||
695985f483 | |||
9ab698f400 | |||
2a39bdb9a1 | |||
9bb56e4753 | |||
795b01422d | |||
e5b8ce243c | |||
fbcbcee51c | |||
860b05b77b | |||
f0b7ab3513 | |||
6902c4da58 | |||
b25c469956 | |||
9bdc5173f0 | |||
c846920f23 | |||
f7fa39b0b1 | |||
66e3f017fc | |||
8a1692f6bc | |||
ce232c3a14 | |||
eaf7e835e6 | |||
1dd29606b6 | |||
995f792b99 | |||
db8d750876 | |||
a8bc269f11 | |||
52cae643c5 | |||
bb8577532a | |||
4b23b5d1af | |||
113bc16094 | |||
bb8f6de064 | |||
3aab60b3ba | |||
ae8ada450a | |||
2408f3b74b | |||
3af1bcafff | |||
a4b4f9b8e3 | |||
30a52c1dcb | |||
5244a31039 | |||
1469d99068 | |||
c722ba4814 | |||
d07d4ab401 | |||
1a876a69af | |||
7683e2e6e3 | |||
1ff57c13c5 | |||
fa33c3aae2 | |||
aeecdcd4c1 | |||
13609673c4 | |||
3c5ff9956c | |||
aa1c6fdf47 | |||
5f7817c85d | |||
da0005b885 | |||
376e4b39d4 | |||
9a308de37c | |||
89c57ab3f0 | |||
025232e8aa | |||
da706545f7 | |||
8ddf3ca74f | |||
e172755b1e | |||
1e8fef609e | |||
aeb6f8b3a2 | |||
7b6aff0655 | |||
a3ddcefd97 | |||
f64cb88d35 | |||
9e5972413b | |||
226c051adb | |||
76e6b090a0 | |||
1bbb3dba3f | |||
c9ccb5d327 | |||
ed4efab1b1 | |||
2bb4cda198 | |||
83c094ad0d | |||
e931371a8f | |||
be0d9d5323 | |||
f9e6c64958 | |||
27b099ae87 | |||
26cb0182b8 | |||
91a2288b5f | |||
cf7c61484f | |||
5ebf79ad4b | |||
ccad261f07 | |||
0dcb8d7fe0 | |||
55fe6f51f4 | |||
dd059c6c07 | |||
fd2014d42b | |||
c8a571d8bc | |||
6f75d45b24 | |||
04f20c04c6 | |||
0d6accc01d | |||
3f88c1b524 | |||
ce026cc7e2 | |||
dcd01ea187 | |||
51ff0f27bc | |||
4ab682e213 | |||
a25b5a32c7 | |||
9529080de2 | |||
b680a86a86 | |||
1b56cdf901 | |||
ff7a9dc2c5 | |||
130e475e1f | |||
7a9409cb01 | |||
82b7e65199 | |||
2d659f7d6e | |||
5751a3d195 | |||
01cec54e13 | |||
7a646cec5b | |||
83da013998 | |||
cc6825e194 | |||
6a536e2076 | |||
d67f9d5e8f | |||
52d5bf7787 | |||
36ab7680c0 | |||
a11c508d56 | |||
83ac11fac4 | |||
b6488fe191 | |||
79de649c0f | |||
a3eea73cc8 | |||
34e4e05b51 | |||
74c91d1f7a | |||
2588882df9 | |||
1165ae6f3d | |||
f69f5f19cf | |||
f56a5f4fed | |||
d86679fa06 | |||
2e7ca2745b | |||
e1db59e179 | |||
53e53c7c81 | |||
2acc194075 | |||
2185d3b7ad | |||
28c8cfc363 | |||
8fa7975b07 | |||
4b06318664 | |||
970399e74c | |||
17d65f03e1 | |||
4055500093 | |||
f8c65c1f97 | |||
ec8a896eb5 | |||
9a6f1287fb | |||
4aff646d17 | |||
83036f8541 | |||
3ebda3e9f5 | |||
1e299f5286 | |||
4e0d6207e5 | |||
007f7f6e54 | |||
33367575b8 | |||
3630be2749 | |||
cbc8d6d8f8 | |||
f5a191d3dc | |||
e591339ce7 | |||
c11c154f42 | |||
518d1c349b | |||
ab09f58e8c | |||
069dea89cf | |||
abfed73ce8 | |||
2250406bfd | |||
3bef3c12d6 | |||
b1cffbfcfc | |||
6db0497e1a | |||
aaa90f5f07 | |||
be2804c49e | |||
552f6994d2 | |||
a628d50575 | |||
8fd37b3862 | |||
5135fefaa1 | |||
fcf04eef75 | |||
a6f9decbe3 | |||
42da484006 | |||
fa8baa4b2a | |||
8a6444d50e | |||
ca704731b1 | |||
fec7b79aa4 | |||
fd9de868c3 | |||
423c688b85 | |||
5e6f003ca8 | |||
fe2a18165c | |||
5a6f47077b | |||
074336e5ed | |||
706d5f816f | |||
8280bbebd1 | |||
5ee875852e | |||
1c448b3b5c | |||
b92c1a28f8 | |||
5f7b91baca | |||
ff5507ed2a | |||
a5285b6c23 | |||
05c3e5c771 | |||
97c12a8b71 | |||
4c3dbbf722 | |||
ef4cdb8bb7 | |||
0278b3f609 | |||
73b690a634 | |||
71f19cce36 | |||
eb32c66e8d | |||
5c31acfbe2 | |||
aaba0ab462 | |||
189c860c9e | |||
d913022763 | |||
ab27389aff | |||
122b807992 | |||
e203d1dcba | |||
4d6be03b95 | |||
f98c2f7e53 | |||
d811c8e17c | |||
417305764a | |||
77fdb8a82c | |||
d0017928cb | |||
93f7d9108a | |||
28ed7b02dd | |||
e426311bef | |||
45c956b357 | |||
bcd57cb9e1 | |||
47092c1067 | |||
7f4ba4b6e3 | |||
767f000b4d | |||
b4e8fefc7f | |||
be94b339b6 | |||
33a2eeaead | |||
75b49bb181 | |||
4f5a4271ea | |||
1585dfeda7 | |||
a75c663cd2 | |||
81a535da88 | |||
90eea883fd | |||
e2a318f796 | |||
50e1ba5050 | |||
32464d36bf | |||
11acff121a | |||
8004647a21 | |||
7bc4c01d9b | |||
2764442ac9 | |||
254a3ebfe8 | |||
7070c03d51 | |||
117c1b333d | |||
9f8410b941 | |||
b9efce10c2 | |||
93baadb138 | |||
2fc85f0545 | |||
8f3d03d81e | |||
6606129491 | |||
74419c29df | |||
faf723a631 | |||
817d03e105 | |||
33baa6983d | |||
355d4e1739 | |||
9a9c1f1fdf | |||
744ea70c7a | |||
c0997feda8 | |||
7cf6232e2c | |||
dcc883dcbc | |||
070f6fed05 | |||
f11f76b2bb | |||
073bb8ebb8 | |||
df3f4ba1a3 | |||
3f55ccab8e | |||
9f6976528b | |||
86ceb337ec | |||
2ce63e9fac | |||
68d6d6eb40 | |||
008d5d005d | |||
2ae7f90f26 | |||
afb5de7f8d | |||
d5c4b1855d | |||
ef2956a5e2 | |||
f3f407747c | |||
74f45dfd78 | |||
ca00db08da | |||
de15bdb058 | |||
2c1f554d0c | |||
db30b8333b | |||
d3e73b5b31 | |||
f18e3896f7 | |||
c2d081ceb9 | |||
dc8edc8f7d | |||
edef953e48 | |||
b485373052 | |||
5248f2dd4f | |||
94bc83c593 | |||
d1dd721f11 | |||
4b7b520b9f | |||
1618033401 | |||
60294596ba | |||
f04c5b5522 | |||
a933c23e66 | |||
a908a31c34 | |||
fb5a6bb61c | |||
1d147bdff0 | |||
8df4e51138 | |||
fec14ec38c | |||
06c21e18ab | |||
d16c33b4c1 | |||
bc1c2caa73 | |||
3188ab3af6 | |||
a158904323 | |||
445bb5b74d | |||
fccf4a0567 | |||
f6b50a8bf4 | |||
ec8618a7f8 | |||
b93b5b21b5 | |||
d7c8b33a35 | |||
a23069ce04 | |||
38459ee6af | |||
c1fa3e21bc | |||
9f55a77777 | |||
a6c68158e5 | |||
f471494303 | |||
06038cd7b7 | |||
f400e51c13 | |||
db7b9e3ad3 | |||
bd9150b7e5 | |||
459b8d22e5 | |||
bb8db1b553 | |||
2c0ab4d49d | |||
f2b4f0a23b | |||
0b868f0eec | |||
5d308512ff | |||
852a15d748 | |||
aab1beb0e1 | |||
2879bc3b0c | |||
45917f0f99 | |||
31e79f0a54 | |||
581d4e0cdb | |||
a983e6ac58 | |||
18d0fec240 | |||
bb831db677 | |||
afa3ccbf44 | |||
c985aaf879 | |||
cba07bb6ff | |||
39fa6112ec | |||
4d5c4e498a | |||
1ba6e860b9 | |||
b19aab58f1 | |||
1c4ebbc3ad | |||
35d28f32e6 | |||
76c6747b7e | |||
092c4be7f5 | |||
5c9c3dfaff | |||
7706d85453 | |||
51334bb094 | |||
fcae987e94 | |||
14f563031d | |||
204a8ffe67 | |||
e0d201b616 | |||
fdc2c3a926 | |||
3c37a2e339 | |||
c536c0755f | |||
5e915f3085 | |||
e60059276b | |||
507d6aa5bf | |||
61c9475221 | |||
b0a4264277 | |||
e6f875e052 | |||
88c03eb577 | |||
9874fca712 | |||
1d0655c15e | |||
d306f3d351 | |||
5e0be134d3 | |||
8c1e9f40f9 | |||
0b86fe8923 | |||
bd4e8822da | |||
3af67924e0 | |||
1c2dbf2095 | |||
8196e72895 | |||
0d1c285af2 | |||
35840a3e78 | |||
7471cf88f5 | |||
697f652818 | |||
1f985d60ef | |||
830ff021aa | |||
b65c05882f | |||
ac1c2d9a21 | |||
57b92a77a0 | |||
94ee8e2c98 | |||
66ec904b4e | |||
502e7f9851 | |||
394e1505b8 | |||
f18604bbf2 | |||
15598cf41b | |||
ecf2ff6ace | |||
8b9c2dd4de | |||
ff76d36b35 | |||
b4fde1e37d | |||
1044b1f6a1 | |||
07586ebd4f | |||
2f334c6461 | |||
3b36ef9188 | |||
573ed5e147 | |||
13d261e53a | |||
3cab02de50 | |||
10de86d0d5 | |||
a9c4641df7 | |||
76afe74b10 | |||
67b5440d0d | |||
d588d4d940 | |||
ab9432d375 | |||
a4c044484e | |||
ee443cf236 | |||
0a80bc9f13 | |||
407a792ef7 | |||
2988289f2c | |||
923fc5ab40 | |||
85cb1d0ba8 | |||
edb72d5511 | |||
33cae5428a | |||
a9942e108c | |||
25143a54fc | |||
1e60744913 | |||
54d80a9343 | |||
627736ca79 | |||
ea6e82c875 | |||
17ad37112d | |||
d6589d1ba4 | |||
d06ce4a508 | |||
3759d27aca | |||
a235de4bd2 | |||
d9d56b2357 | |||
07361f12ab | |||
482f68e741 | |||
d1f9c7b77e | |||
0ef279509b | |||
bf41b712c7 | |||
105979f71c | |||
48a9a6b5eb | |||
124d80928d | |||
e1a05ad851 | |||
463243d49c | |||
04cb2f28cc | |||
d468fa2721 | |||
f20e56e202 | |||
14e2177a40 | |||
088c9a86ff | |||
aa07cac43f | |||
6afbbdda33 | |||
bdfdaa4978 | |||
eae69530ae | |||
1767c51787 | |||
b4a56a3966 | |||
412cb2ec13 | |||
167832c2ca | |||
a355b11dab | |||
667f7eb2ea | |||
0131c49096 | |||
2b102efc8c | |||
cb4680500a | |||
0fb1df4af2 | |||
b90a3d7b32 | |||
a94655dcfe | |||
9a2bb059e7 | |||
2a26377047 | |||
d0a042a186 | |||
563d4e59bd | |||
670f6a72b8 | |||
401a317aae | |||
63a0e83ea6 | |||
09deda3746 | |||
ce8e4e3e57 | |||
d62078e910 | |||
601ca9287d | |||
9920c71825 | |||
e1ef7d177c | |||
1e7ef5d9bf | |||
8128835f91 | |||
41753312e1 | |||
e9f91191cc | |||
2202ab1931 | |||
6d9f0c7c0d | |||
7fd92d9ed0 | |||
04b39f195b | |||
f6786c8dcb | |||
6babe76496 | |||
9c9b4f2f8b | |||
331004836b | |||
9905988a57 | |||
22dfa8a23d | |||
a46442f167 | |||
8c53f0719b | |||
eaa541eb59 | |||
4440690786 | |||
d64ea0f83b | |||
fbf5d8c3d0 | |||
beb691f770 | |||
7695982c20 | |||
ce3e848b40 | |||
92be938e96 | |||
b6160d950c | |||
addfb21a94 | |||
def6dd9bc6 | |||
fdf96a20ac | |||
9f16184af5 | |||
d0879b33a6 | |||
efc028b1f2 | |||
9ea21fa89c | |||
ba1edc9264 | |||
417a5b226c | |||
832258da96 | |||
e20d5a2c44 | |||
7a353ec965 | |||
acddf49432 | |||
d61e79050c | |||
97488abc91 | |||
c00e1c59d8 | |||
42618bc34e | |||
290c8e7a3f | |||
a2681d2bac | |||
10aff315f6 | |||
50fea42ef5 | |||
88e011814b | |||
a6c3c638ac | |||
8bd2c972b1 | |||
0855331941 | |||
89ea90351d | |||
9990273917 | |||
ad35ecabea | |||
d0e8e09cd8 | |||
4ff17f10c4 | |||
7582e9397c | |||
1b70fe5d30 | |||
68deed298a | |||
222368c645 | |||
a1a261457c | |||
b6a4788586 | |||
a6a8431968 | |||
4dbe66464b | |||
339de50891 | |||
fe7611c46f | |||
1e6f5b22ad | |||
ee6e4c70f1 | |||
7ba46269a0 | |||
3c84ac86fc | |||
282616c72d | |||
64a03e970a | |||
3d8a54eb37 | |||
40d2f38635 | |||
06a8bbb41d | |||
487b17de3e | |||
7938918e9f | |||
c0cf6866fc | |||
74a101eb48 | |||
3d2c1bf2d4 | |||
5095fa61e3 | |||
948e81408d | |||
e82f629cf4 | |||
abac75c207 | |||
04950c7141 | |||
c5cb52fd7c | |||
08db3b6392 | |||
bb86a40e06 | |||
098501527f | |||
58e0362edd | |||
f41157e649 | |||
d35c802793 | |||
da178ac793 | |||
d89ad9c1b8 | |||
bcfe6f327d | |||
102fc80d32 | |||
46f32a99b8 | |||
0120b8c85c | |||
76b4309400 | |||
a83a66aca2 | |||
1d0fa898ea | |||
10f102be21 | |||
8601099373 | |||
e0a1f09313 | |||
d91175b212 | |||
230c09c06a | |||
d47e55da92 | |||
e66dc0cc4b | |||
d05c77cca2 | |||
a117fa2116 | |||
33adc83ddb | |||
06a604e670 | |||
fad32bcd83 | |||
aa7710e064 | |||
6aaf956b08 | |||
07913d5ae1 | |||
6bc02d5627 | |||
74c4de5832 | |||
052b2551ad | |||
66e28e93bb | |||
0bbc971ab5 | |||
9fb7b57f82 | |||
c5b9256360 | |||
2dacf26d09 | |||
1684c1b219 | |||
6b33894f99 | |||
8d025b7caf | |||
8547e0f176 | |||
4395b21424 | |||
cb71e73ade | |||
47103bd6b3 | |||
b90c95d90e | |||
fb86e32dcc | |||
d69360c6b1 | |||
bbcefffcea | |||
2c380e7a8d | |||
a305b15f82 | |||
35b5a8b769 | |||
3d4eecc871 | |||
2df39733e5 | |||
63903d0e4e | |||
9f240ec60f | |||
3701aa093e | |||
aa9066fccd | |||
8ada1d8e9c | |||
3dadfc7e17 | |||
d539eb9d25 | |||
6d43519a8e | |||
1cb4b3d380 | |||
14d4aab3bb | |||
15a171f6eb | |||
00c194a819 | |||
6f3abb7a87 | |||
12b9f08953 | |||
53c3692eac | |||
2cd20dc3d4 | |||
3ab00292fc | |||
86362f7205 | |||
2f17ecbd8d | |||
0b5ae7ba68 | |||
570077231f | |||
77a801d237 | |||
a558344c11 | |||
08884f57f3 | |||
72ecc6ef53 | |||
6bcaff1a4f | |||
5109f2aaab | |||
2374f1dfd1 | |||
fa7f51d533 | |||
a7ddaa8eac | |||
8e606f97f8 | |||
7665d9c3a6 | |||
4762c7b42a | |||
63296d583c | |||
168ab99d4c | |||
0178207021 | |||
3cdb0cb610 | |||
0ed8a4e161 | |||
c2e8e4b9da | |||
57815a4f56 | |||
7d37ed1382 | |||
ebae81e96d | |||
0eeb9b86d6 | |||
e524fb497a | |||
0b5c641490 | |||
8d5134399c | |||
e8c2351157 | |||
8390d5cda9 | |||
5d509d5e1c | |||
447c39a9b2 | |||
8297643fcd | |||
eb443e3b39 | |||
3af74cfb15 | |||
c653e0343d | |||
3581d79335 | |||
31e07f76a9 | |||
0b1e654801 | |||
fa5b1830b0 | |||
32c239d1fb | |||
1679acdbff | |||
3a77c2096d | |||
69d84a3b58 | |||
2aa590cb07 | |||
bef111d0a5 | |||
c376d96825 | |||
3f1509809e | |||
b195aa00c1 | |||
9b7cbb3159 | |||
77933f4449 | |||
8e36a6d575 | |||
58f1d950e3 | |||
9a8c2b67cd | |||
5e519fb8b0 | |||
83332636f5 | |||
6898b79721 | |||
5c8213a769 | |||
2aa9100846 | |||
d08c13b947 | |||
2b4c6efc82 | |||
1d1d69bc52 | |||
a18fcc9ff2 | |||
a42643aa8d | |||
6162a1d323 | |||
76e86fc6e3 | |||
450870cba7 | |||
cc2fc7c2f0 | |||
96b50cc190 | |||
4616918013 | |||
6fb5df6c77 | |||
0e18a5b428 | |||
2cf770f501 | |||
ac1596a684 | |||
a8bec7abcc | |||
0e5ed7cca3 | |||
ab47e2a583 | |||
11f70a7e29 | |||
1be976eeb4 | |||
9dd70e0a0d | |||
9abc44b681 | |||
3889e7a60c | |||
23c0956441 | |||
0ddedd4d6b | |||
e886efdb34 | |||
bb87344a74 | |||
974df59986 | |||
f54629e7b6 | |||
aa6bdbb62f | |||
b690b87ce3 | |||
11078d66d9 | |||
c09988ad94 | |||
4b0bf39dd5 | |||
1e3eefbc8d | |||
b729effbdb | |||
82a645a73f | |||
553daf13ea | |||
bc11155cea | |||
8c22dd3254 | |||
ddd64c566d | |||
ea7b4f6d33 | |||
c4c4fbf86c | |||
98f31d8589 | |||
aba56c89b2 | |||
c48a163535 | |||
60cc3c4072 | |||
f3b661f766 | |||
2e376b3156 | |||
524127afbf | |||
55dfc8de18 | |||
2c6207abbd | |||
a0d4923ddf | |||
c0e0ed6efe | |||
b41a36e635 | |||
c83a5099c8 | |||
fac908389d | |||
f2667a8330 | |||
b0f4c9087e | |||
0e729c7ed5 | |||
a46e41fca3 | |||
97f05f43dc | |||
8e9faf27c1 | |||
ea417833ea | |||
6a49870a72 | |||
10c497aa0c | |||
356e91f2ec | |||
71b5984975 | |||
0cef4e765c | |||
936d2c9301 | |||
ccadb25f73 | |||
83c9433e67 | |||
3b9a2b07ef | |||
a1e920a0a7 | |||
7add441984 | |||
0291973b36 | |||
c18b867341 | |||
a633732440 | |||
0b0cd37920 | |||
0e0252b755 | |||
8aae35f658 | |||
2528ff079c | |||
9b144d869f | |||
7f2186cadf | |||
c21df07886 | |||
09d60d785c | |||
05d7fb6290 | |||
8213d87a83 | |||
1b74f643f6 | |||
69216bf72b | |||
e5e73ff20b | |||
a785d3f77c | |||
bc9f2925fb | |||
1f23cfe0ef | |||
f8c4ab611a | |||
63226218ba | |||
608758d5ce | |||
27234a2ef3 | |||
ff7aa81f89 | |||
85ed2f3206 | |||
d543d9c0f4 | |||
e652c0eb5d | |||
59b386526a | |||
e32afab7b0 | |||
21b138d0f6 | |||
f1f6224c72 | |||
4be4f71f55 | |||
5c6cb9888d | |||
1cf9952db2 | |||
6a0b0b6de9 | |||
df56607dff | |||
ee4fb8435e | |||
ad35f61518 | |||
3473ad0cf6 | |||
6cfbdcb2ab | |||
77a6d84045 | |||
e3df33bb1b | |||
09dbb90b09 | |||
2cfe2a7878 | |||
3b8925c78b | |||
5883034c61 | |||
23af91d102 | |||
529fef20cf | |||
91aacda85a | |||
316e53e68c | |||
31e26ebcb5 | |||
e61a509a49 | |||
7d0fb0da95 | |||
4dc4e1457e | |||
1d186b6f35 | |||
337959b491 | |||
b849b954d2 | |||
3bc518084a | |||
c7b3a3d2fe | |||
af07b20d51 | |||
aaa26805ad | |||
1fdc2abf1b | |||
c697b577a2 | |||
557bd833bb | |||
57a23b770a | |||
8afdaf39e3 | |||
1a83c240f2 | |||
dcf692625a | |||
4ef9caf543 | |||
814dd8e078 | |||
b799a696b2 | |||
decd3c0c28 | |||
00a6fa0720 | |||
b5007211b6 | |||
4d7a5ceacc | |||
1404bcbb6b | |||
59362e560d | |||
ff51f5619d | |||
ae1dcc52c1 | |||
b260d265e1 | |||
a2b450d6fd | |||
61e704e38a | |||
a078f7321b | |||
452dfbed1a | |||
0720a51b29 | |||
ee756a8161 | |||
acd72b5636 | |||
03335f2295 | |||
aca56064f4 | |||
8d81408435 | |||
bb29456c89 | |||
3383e19984 | |||
8552943f41 | |||
fcce0da975 | |||
4a45b2f347 | |||
6d6d06c901 | |||
28d3f214d1 | |||
16d4fa3d96 | |||
7d665f3584 | |||
fc66505c53 | |||
3a0a3a8972 | |||
bba5fccc03 | |||
53de742470 | |||
54cc5d29a0 | |||
652e759330 | |||
1e86d5b11d | |||
98a260220c | |||
c41d3fedd8 | |||
1b6a53431c | |||
e00e13e2aa | |||
c7bf68d6b4 | |||
1d31e5a2cd | |||
bca45fbc1f | |||
ff40d185d2 | |||
17a4be2606 | |||
695d95df19 | |||
62ce40d933 | |||
cb357221a4 | |||
d0e08d6233 | |||
0edad17d67 | |||
068395150b | |||
7ba2ba7d12 | |||
e6c1c391a8 | |||
388a439ca9 | |||
9aeb4c2b57 | |||
e3f9cab742 | |||
ca0107e279 | |||
eeb92d7e60 | |||
bfd6b53aab | |||
f00e081a9a | |||
d4c4f18090 | |||
13dbf46a39 | |||
eedc4be54f | |||
ca2051d6e3 | |||
64c07db9ad | |||
e69b1ce000 | |||
0cfd333d0b | |||
4d86216f5b | |||
3f78278beb | |||
880ef58b3d | |||
5a97639b39 | |||
e204b001cf | |||
1f32ecffd8 | |||
b3e4c47565 | |||
a16cc8b247 | |||
ea4f93eb99 | |||
366c8d4ca3 | |||
bcd46becbc | |||
3696a7c2d9 | |||
31a8aa1ee8 | |||
83915ba521 | |||
ba6fad02b6 | |||
d544b2d495 | |||
744437f8e6 | |||
99474b6340 | |||
908a320363 | |||
49e0c5ad0a | |||
c616d845b5 | |||
d37239536c | |||
c5326bd62b | |||
073281e2ae | |||
8942821ec0 | |||
f904f6603a | |||
c4f901d159 | |||
faa8fac1ec | |||
f5709437d9 | |||
9c70e2c105 | |||
7fa1365c54 | |||
bbebdc1dca | |||
8a4acd6995 | |||
d73a5b933d | |||
52694cdabb | |||
b0de56c6a5 | |||
2672671872 | |||
022cf2bf88 | |||
f6f61cbbad | |||
caea1a2bb5 | |||
6066a7eac4 | |||
4282af0fc9 | |||
bebf5c0476 | |||
d0923b6d4c | |||
511726e4b1 | |||
80b581dd09 | |||
a4c4708fe6 | |||
bd51886f30 | |||
a79c3a1b81 | |||
71069cdfc7 | |||
a2bae2dce1 | |||
b226293b44 | |||
3d24a7267d | |||
61cfef4ca4 | |||
8c38458923 | |||
216d29ef25 | |||
d52adf1f32 | |||
2887103b35 | |||
aae828b911 | |||
1e16b255b9 | |||
39942766ab | |||
66edfe9ddc | |||
d956a20a69 | |||
cdc6aba8c5 | |||
3b422bc854 | |||
a1ad2475a7 | |||
32da67bf22 | |||
64b9326460 | |||
a1671dd82b | |||
6b55f8b546 | |||
e44da1bbb8 | |||
e50cd67ba4 | |||
f1a35295c2 | |||
03af7cd158 | |||
251e7dad51 | |||
f745acb028 | |||
a8787c5c1c | |||
9233887cce | |||
72549dfd5d | |||
dd83521629 | |||
fa137f67a4 | |||
6c31a5e94a | |||
220c313cc3 | |||
94dd79e9fe | |||
ac4a73dd25 | |||
5331bfd785 | |||
f507e5dd62 | |||
4dcd03eaee | |||
d07a63e47c | |||
4ace7ff455 | |||
ef59f324b0 | |||
1d42cf3c6c | |||
598d7eb160 | |||
bf1f639ea2 | |||
7ffa35b047 | |||
d9362ef9b9 | |||
e8eb25122e | |||
5e626b91d4 | |||
2ce406ccb8 | |||
d76c9e95b4 | |||
729dbbd9fc | |||
81d645d1a1 | |||
da0bc948ac | |||
4ae9a7b966 | |||
9fabefb1f3 | |||
4d5e1b1319 | |||
7b68b0eebf | |||
835e3ddeff | |||
822aaf0f08 | |||
36666ce4da | |||
49c3e92634 | |||
ebc2e5a593 | |||
9db1838705 | |||
af1b4e350f | |||
27c31d2088 | |||
a8f01f87d0 | |||
5b509df0c3 | |||
9ce57f1228 | |||
e82935d917 | |||
7654ca6963 | |||
ce71c1f339 | |||
c1777a2970 | |||
d70e331c0e | |||
853878d520 | |||
96ef1bdc65 | |||
8828f2985f | |||
5d222c099e | |||
261f315beb | |||
073bd75e17 | |||
2b52123fcf | |||
79a77109d3 | |||
f4694a8c08 | |||
d55aeb7687 | |||
e7f224f780 | |||
c6c3e0db84 | |||
da8a3664b1 | |||
bfb0e6fcd2 | |||
48a031af3c | |||
f51140c247 | |||
25098690a0 | |||
7676aff709 | |||
aee7d04c12 | |||
6725ecaba7 | |||
dfa72fdb96 | |||
f947ae4b65 | |||
2b6c613f1a | |||
54b95346c1 | |||
d0b34f241d | |||
9ee13a934e | |||
abfef3bbf5 | |||
fbecd99861 | |||
a33043f639 | |||
95d2255bfe | |||
1758d236a2 | |||
e4da4fbe0e | |||
bb8caad381 | |||
7fc311d5ff | |||
217610d7d6 | |||
f35a02b15d | |||
26a22d8d00 | |||
75c961b767 | |||
08e3ce5a20 | |||
b9459019bb | |||
6936b5859c | |||
19b5d50cb1 | |||
693f62ff68 | |||
48f662dd74 | |||
a46af5946c | |||
e96e98b339 | |||
02f4db83bd | |||
64bff25f78 | |||
3c85452bb0 | |||
f13f9b0eab | |||
03e11a715b | |||
8b148bf085 | |||
dc76c7f783 | |||
13da0fc092 | |||
9d04401ffe | |||
7df3b072a9 | |||
9c6be8b5ab | |||
b946576839 | |||
b67588d018 | |||
713ee7fe46 | |||
f9a2fd3616 | |||
6459cf8cdf | |||
15c6ef7b06 | |||
ecdab41267 | |||
7c45cee6bb | |||
7544b2e2da | |||
0f4b6db3ba | |||
189a122249 | |||
d7702be1e1 | |||
a915459097 | |||
19a583dc39 | |||
2113471478 | |||
4fe10219bc | |||
b1e757f363 | |||
41d018d146 | |||
c90f9e13ab | |||
edfbb2aa53 | |||
1be111d88f | |||
458a7e508c | |||
207394908e | |||
98349e5364 | |||
c11dc64722 | |||
1cb3324e61 | |||
4750f4b962 | |||
688684eba4 | |||
8f0cb41da2 | |||
eab335c46d | |||
9e8f8dea46 | |||
d7d300ea59 | |||
b12d04503b | |||
9e0c3c4fcd | |||
33d4221c79 | |||
abcb86553d | |||
d0d46abc16 | |||
d3038d22f9 | |||
660c889e46 | |||
4a1e693a30 | |||
cac05d4dfd | |||
0d3b729680 | |||
3725427945 | |||
27e1e22d5e | |||
718ccc9731 | |||
5f78a431ab | |||
1da1e07c83 | |||
46be823124 | |||
68f492359e | |||
50a71776ab | |||
fe1b22686f | |||
2ea40f01c5 | |||
4d24d5202c | |||
fb1d6dabce | |||
4fb4b02d98 | |||
7bfb7c357c | |||
1c7e2d23e4 | |||
9c66cd3bd0 | |||
76ee96a9b6 | |||
f9e43085bb | |||
4756c05741 | |||
74578618a0 | |||
773ee47c2b | |||
7d61547db8 | |||
65732845e8 | |||
fb43bd1cd1 | |||
5a603b0463 | |||
2ebb49ca8a | |||
971c41c717 | |||
d0f810f0bc | |||
8159f4af7d | |||
f3cc52d840 | |||
18f29fc61e | |||
62a2d52514 | |||
014e7db3f5 | |||
7695d118e5 | |||
aae383db8c | |||
cd94f76572 | |||
28e6a97e39 | |||
5fe7d825da | |||
5d94a1b033 | |||
8a9df90d9a | |||
7522e3dbcc | |||
db7516ab9f | |||
dbdcac7d5c | |||
9ccc0c0896 | |||
3c93c847ca | |||
1054af7d04 | |||
2b2b1e4d27 | |||
05e73682cd | |||
8f7ff5b2fe | |||
f6c5a2968c | |||
8852117a60 | |||
670a3c1d5a | |||
337233c502 | |||
0189df3161 | |||
145c590df8 | |||
63434da0b4 | |||
40e2d8dbaf | |||
11cb3130d5 | |||
bd107e1052 | |||
7543dea8b2 | |||
cc7b2f8281 | |||
dc11fc2de8 | |||
e2ebb5c433 | |||
792a572320 | |||
211836f77b | |||
a136f6d8ff | |||
dc05179b5a | |||
dfd66ddf5a | |||
b9384ff34e | |||
85039fb6e4 | |||
76bed78a58 | |||
6634f05454 | |||
b1d78d77bf | |||
2013d8505d | |||
f0a90b4edf | |||
46a0613f00 | |||
4103818d20 | |||
9385b5d706 | |||
f8a48affbb | |||
c9a5172fdf | |||
0c45d258ec | |||
e0e21283b6 | |||
64a7e92f28 | |||
8ad1652418 | |||
f1dd90bd19 | |||
673151a9bb | |||
5a568ea050 | |||
992cb20688 | |||
fca416a41e | |||
c30c43c07d | |||
63a45136a3 | |||
f0d8900175 | |||
9342f49738 | |||
b2c45f5b96 | |||
fb06b5280e | |||
325602ce12 | |||
3c2dc76f01 | |||
76f8611a5f | |||
9181365b85 | |||
b6e8269e9b | |||
2ca0b197b8 | |||
e3f1da982e | |||
eeff891ac7 | |||
db7879438f | |||
64045940af | |||
a43c5f51a4 | |||
6e578a31e6 | |||
f70f0565b3 | |||
013870cd2c | |||
697cc8efd9 | |||
216aab1e3d | |||
4d423a3e62 | |||
ec38b4e482 | |||
316683bd37 | |||
47ba4662bf | |||
751bacedaa | |||
0c0d6e8601 | |||
6cad805332 | |||
5025d8450a | |||
cf6950d3bf | |||
3e88e8fc08 | |||
daccee387a | |||
1fef4b5041 | |||
2091c5062c | |||
707103fdfd | |||
e831855ecc | |||
32c3ec258e | |||
d75145acf6 | |||
1b1648f46b | |||
8e86c155d2 | |||
8a1c7533e2 | |||
4f4713df94 | |||
a1754bcce9 | |||
e31e949b9f | |||
35ff08be09 | |||
91f1f19184 | |||
7108ad232f | |||
0a06f14837 | |||
04e57d4d32 | |||
ebb8e380e9 | |||
41dd4ffaf9 | |||
26f5d3b65f | |||
9085f8e279 | |||
5527d5349b | |||
419f0c0f68 | |||
a5e48669a2 | |||
e197c21807 | |||
107efbeb24 | |||
9d1b9aa9e1 | |||
eb6c403500 | |||
0eb0fb889e | |||
38d905bf58 | |||
c8db708d5d | |||
565301e416 | |||
7dded6610e | |||
0ba92ef338 | |||
ab9bc95d53 | |||
131f0315c4 | |||
80b616d04b | |||
46c8f859b7 | |||
102edda4df | |||
421ec4f8d1 | |||
5b830a8588 | |||
46092ebf22 | |||
060517093e | |||
e7867e80f0 | |||
6433d56975 | |||
0bf7dd652c | |||
26d0587389 | |||
12ba0e771c | |||
4d4dc66df0 | |||
60dfd8461b | |||
0a2ba82c76 | |||
507fe835ed | |||
b8e533f12a | |||
f51a48ec3a | |||
c049216fdf | |||
a9583afc1d | |||
62b553cdd6 | |||
d29e9c89db | |||
5d7f49dc79 | |||
5500095ff4 | |||
1c2ea2cdc0 | |||
b33000878a | |||
bdab1bca53 | |||
c0f5f311db | |||
f190737f22 | |||
868440f546 | |||
13f4f04692 | |||
9bc4222746 | |||
69a5bbbbfa | |||
061540fcf7 | |||
f51ccda810 | |||
89a0ead829 | |||
6f5ef44e0d | |||
b9a1907899 | |||
040b2ac978 | |||
422af49c2f | |||
85de86a16b | |||
4e6d207c45 | |||
8c3419bdbd | |||
634c42da22 | |||
9079ab7cb6 | |||
07bfa575c1 | |||
0176e7a71f | |||
ed22b4173b | |||
97b8860c07 | |||
85e70c31ef | |||
349cb50963 | |||
b8f7239058 | |||
08fd8a055c | |||
fb6f843a8f | |||
04481347ec | |||
a28e876b9d | |||
f7153344cf | |||
8ec959fbce | |||
92ea1ac826 | |||
ffe41f8d32 | |||
bb6ac5ea13 | |||
04cd47f553 | |||
723361a572 | |||
5d62e59e4c | |||
9c9fbee8f5 | |||
05fcf66b74 | |||
74d159a4ed | |||
dd716840f0 | |||
49fb13bef1 | |||
19f8c8b2da | |||
4daf5c8643 | |||
9d6db4a28d | |||
56feed1c76 | |||
9ee9c9d068 | |||
5dbdb3bed6 | |||
49cbc11ddb | |||
b6de2dcb80 | |||
14e2ae6126 | |||
70f003e107 | |||
fbc122eafe | |||
56bee6420c | |||
7669461459 | |||
83510ef3fd | |||
296b4c4bbf | |||
4fc72d9106 | |||
73da5a1e85 | |||
04631848c4 | |||
bd656f6e7b | |||
9ff700ebac | |||
ceeacc501b | |||
a60f434e20 | |||
b1de6b21f3 | |||
d9dd4cebec | |||
1956dfa818 | |||
c41a87dd80 | |||
9271095cc5 | |||
7559a1be8a | |||
d333ac1785 | |||
8376a70441 | |||
2756ca4347 | |||
3ac22f82ed | |||
5732373daa | |||
0ea47f9d33 | |||
b89363e4a5 | |||
ec7dbd145b | |||
95c68267ff | |||
2892dfeec3 | |||
f5e3c0b9d0 | |||
2da1f36671 | |||
56625df74c | |||
9be89160e7 | |||
4adf569dea | |||
20a7558f31 | |||
d05b9618ce | |||
a85b377d04 | |||
e543b3f6fe | |||
d7c67668fe | |||
a50e7ca321 | |||
c67072b90b | |||
b783aa71c0 | |||
ab2b0c908a | |||
52d2ae582e | |||
887f3533fd | |||
64de20a126 | |||
e40671a3d9 | |||
621b0599fd | |||
39895c74d8 | |||
c09b71ccc4 | |||
0e3c339bb6 | |||
3bfcb95fa8 | |||
1c4b660412 | |||
f978a99faf | |||
3b2c5413c9 | |||
4489a480fd | |||
3907a4078a | |||
d38379ece9 | |||
1cc2c772dd | |||
e4a590efa2 | |||
3424a02252 | |||
30d45f798d | |||
a831a3fd86 | |||
26bb3c10ef | |||
4950eed520 | |||
785a1c8258 | |||
f9f3851b4d | |||
cbe7333181 | |||
b659605da6 | |||
40e94ca19a | |||
f99b7af661 | |||
30d1038d1b | |||
c1063be2a3 | |||
1a947ba3a3 | |||
5ba9a93b39 | |||
90e3e5f057 | |||
17b787f603 | |||
b64a984606 | |||
ce1d3a93a6 | |||
cec097be3a | |||
4d0d89755e | |||
7ac92f64dd | |||
5dcdc7809e | |||
1ebe6a825a | |||
f28763d756 | |||
294792326a | |||
b6a1261751 | |||
88e7dff93d | |||
bedd3b4b7b | |||
08ad26a63d | |||
3fd13cbcd5 | |||
01d678a226 | |||
5e1dc48858 | |||
785514bb55 | |||
683b4d828c | |||
9ddd68973a | |||
6c1d42acae | |||
825fd93767 | |||
49feda62bd | |||
554913daf4 | |||
7f346e9d73 | |||
90a398bbd7 | |||
fe8e3b7180 | |||
9540ce5030 | |||
2e770fe47e | |||
0c72b98f31 | |||
346fad5bb3 | |||
c0ad561a46 | |||
64014894cf | |||
3ef87bd872 | |||
73353e0f65 | |||
8015a60715 | |||
55b6dffd13 | |||
08668f1802 | |||
067f86fe12 | |||
715b63ceb3 | |||
929df991c2 | |||
1764e8124e | |||
27fbcf8267 | |||
a75e759e59 | |||
4645b014c5 | |||
753aaf3aab | |||
1bada2b0cc | |||
7b4164063e | |||
ead51a75d5 | |||
93424a0fd8 | |||
713c6f3ab0 | |||
50b335b783 | |||
415792edf5 | |||
d07235a027 | |||
792a646a19 | |||
af465af8de | |||
4f1bbd23af | |||
dcadc8b806 | |||
b46b15dea0 | |||
e2b6cfa02e | |||
42de4b169c | |||
3af05a6d0d | |||
693eb02a5e | |||
c254516737 | |||
c40fdd01dd | |||
4ed115e9c5 | |||
88499b296b | |||
ab5ac95725 | |||
7521cc4611 | |||
029cdb4ab2 | |||
cba12021c3 | |||
04ad6223ec | |||
45421e24e8 | |||
88b680ae8d | |||
b6b10bb44c | |||
3f09ba7543 | |||
6629ea2d4a | |||
b4d75ac1d1 | |||
d43f990fac | |||
de7e86f522 | |||
d668d16ca7 | |||
c0fe1ed084 | |||
867c2fac0a | |||
e5074bfe8c | |||
2bdc785fd7 | |||
93a644ea9d | |||
8c8bdc0d35 | |||
b416af5bcd | |||
85f083786f | |||
f655651e09 | |||
51eeaea210 | |||
4740891e47 | |||
0e28161700 | |||
44ceb79f84 | |||
56f214e071 | |||
e8e4ce72cd | |||
1d8a6f6929 | |||
c518279c0e | |||
ba9b9e1242 | |||
5f4e02e517 | |||
5491e9e29e | |||
ad5fe3771b | |||
24d36f1472 | |||
57065289a9 | |||
59b8263a6d | |||
37007c3a87 | |||
d773144417 | |||
be0b3f822b | |||
ab791dd138 | |||
466fb6742d | |||
a6fd4fb55d | |||
6441090cf2 | |||
981ff520b7 | |||
f4ef517393 | |||
f0f9662ae9 | |||
2668d692eb | |||
8d30d8a89a | |||
96db324a73 | |||
0344d93ced | |||
15999d0be8 | |||
782ac539ea | |||
d35ea4dec6 | |||
da011cb0e7 | |||
5d146f7a0f | |||
f6975a6b11 | |||
75d3d6573e | |||
91e70e00ac | |||
9035d75a2b | |||
b29763aa9b | |||
02710228dd | |||
9927d9627f | |||
23b0c4782e | |||
a872275098 | |||
c33ddc2e33 | |||
ea5517f04b | |||
6876618cea | |||
fe6eb7f2c5 | |||
2e3dfb2169 | |||
26be19ba8d | |||
14821f8822 | |||
4109c28e05 | |||
a3d54f9a1f | |||
212d781c96 | |||
9610decf4d | |||
679eebe24d | |||
4d3ab44d26 | |||
56b9f6e738 | |||
aa14e980ff | |||
2fdb9ce067 | |||
251277acdf | |||
7333ed1788 | |||
2608c24940 | |||
662174d299 | |||
e0d8e3084f | |||
6a143aa2b2 | |||
c285171dac | |||
d85b0dff72 | |||
1f31963e92 | |||
0fa7f01635 | |||
c252785982 | |||
3c078b9c86 | |||
afd11d3ebc | |||
3bc7a05b1a | |||
e8d1dfe639 | |||
869951babc | |||
795b9ff872 | |||
47abf17be5 | |||
0082d82183 | |||
6c71f8b0d3 | |||
7ce7c7607b | |||
dddecc5b7f | |||
8837eb47f2 | |||
e09867f060 | |||
3918057164 | |||
1f87293d78 | |||
41e9bad75e | |||
483bbd4e4c | |||
d318027932 | |||
93b5393611 | |||
c8466645ed | |||
960160b061 | |||
1aaf69e669 | |||
6bf3b81348 | |||
8e5dd3d654 | |||
735efde838 | |||
f8bb1d9431 | |||
6fceed3bea | |||
1991006cb9 | |||
f9dc5d65ca | |||
faa3807cfe | |||
bf7283465b | |||
8687f7776d | |||
9eeff2f681 | |||
9c7a0beee0 | |||
b35b10d463 | |||
0e7bcb1b00 | |||
6ea358f784 | |||
536900e5b2 | |||
6c1db1b388 | |||
0ecd180a27 | |||
13b081257a | |||
2d26d533a0 | |||
f7f91086a3 | |||
201087422d | |||
81c3ce3cdc | |||
430875969a | |||
ad1a19d0e7 | |||
eac0ccc2cd | |||
50b6773287 | |||
2f50babef1 | |||
ccad42d483 | |||
a3b3ae35d4 | |||
8871820169 | |||
64de2e10a0 | |||
8994fbf3ec | |||
4dde849a20 | |||
c165d1f5ca | |||
86d387af37 | |||
ddeab3aea3 | |||
6e1ccacbed | |||
2c8544ab91 | |||
288c67caf6 | |||
540b0f4977 | |||
111791559e | |||
ef7e1d0cda | |||
586f414a89 | |||
5801d3b416 | |||
633e5ad326 | |||
f44af51d13 | |||
95790ff60d | |||
b27a572099 | |||
6881f0ccb4 | |||
8939d32d81 | |||
94204bf505 | |||
477a08af04 | |||
3ee2ad14c6 | |||
d487b0ba50 | |||
8a7b034d6d | |||
79e9ce21fa | |||
155ef25f12 | |||
5a80e97c82 | |||
aace438502 | |||
3df8fd625f | |||
b3b3f60bb6 | |||
8262aaa283 | |||
f7fbc357f8 | |||
a127b3f24d | |||
a789ca70e7 | |||
b9e343e640 | |||
4b71297969 | |||
dc4a1ba99c | |||
8d388239fd | |||
a26bc613a6 | |||
10f343ea81 | |||
aafbee8c4b | |||
6acbf03300 | |||
afc344c4ad | |||
6d0081ad61 | |||
fe05e196c5 | |||
c099f8c7ed | |||
642c7fab1d | |||
f07243fe16 | |||
b9c7d6e433 | |||
c75e7ad28a | |||
ae18165fbb | |||
d0da003d5b | |||
4c715ebb96 | |||
3c8687a73e | |||
2d186c8be5 | |||
d13a0a97e0 | |||
f22a76e911 | |||
8b27ff7eac | |||
06b2d87244 | |||
9830534e40 | |||
b0562224c9 | |||
f57a8715bc | |||
93dcaea226 | |||
9c4d6c0297 | |||
59a8adb6fb | |||
969dd8c612 | |||
aecf567cbf | |||
df7369f1a7 | |||
bf00fa1ee2 | |||
7cefd3431a | |||
41a5f0b540 | |||
2202b8b8bc | |||
1bb207e0fe |
6
.gitignore
vendored
6
.gitignore
vendored
@ -74,6 +74,7 @@
|
||||
/git-index-pack
|
||||
/git-init
|
||||
/git-init-db
|
||||
/git-interpret-trailers
|
||||
/git-instaweb
|
||||
/git-log
|
||||
/git-ls-files
|
||||
@ -170,6 +171,7 @@
|
||||
/git-verify-tag
|
||||
/git-web--browse
|
||||
/git-whatchanged
|
||||
/git-worktree
|
||||
/git-write-tree
|
||||
/git-core-*/?*
|
||||
/gitweb/GITWEB-BUILD-OPTIONS
|
||||
@ -178,10 +180,12 @@
|
||||
/gitweb/static/gitweb.min.*
|
||||
/test-chmtime
|
||||
/test-ctype
|
||||
/test-config
|
||||
/test-date
|
||||
/test-delta
|
||||
/test-dump-cache-tree
|
||||
/test-dump-split-index
|
||||
/test-dump-untracked-cache
|
||||
/test-scrap-cache-tree
|
||||
/test-genrandom
|
||||
/test-hashmap
|
||||
@ -198,8 +202,10 @@
|
||||
/test-revision-walking
|
||||
/test-run-command
|
||||
/test-sha1
|
||||
/test-sha1-array
|
||||
/test-sigchain
|
||||
/test-string-list
|
||||
/test-submodule-config
|
||||
/test-subprocess
|
||||
/test-svn-fe
|
||||
/test-urlmatch-normalization
|
||||
|
4
.mailmap
4
.mailmap
@ -13,6 +13,7 @@ Alex Riesen <raa.lkml@gmail.com> <raa@limbo.localdomain>
|
||||
Alex Riesen <raa.lkml@gmail.com> <raa@steel.home>
|
||||
Alex Vandiver <alex@chmrr.net> <alexmv@MIT.EDU>
|
||||
Alexander Gavrilov <angavrilov@gmail.com>
|
||||
Alexander Kuleshov <kuleshovmail@gmail.com>
|
||||
Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
|
||||
Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
|
||||
Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
|
||||
@ -185,7 +186,7 @@ Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
|
||||
Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
|
||||
Philippe Bruhat <book@cpan.org>
|
||||
Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
|
||||
Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
|
||||
Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
|
||||
René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
|
||||
Robert Fitzsimons <robfitz@273k.net>
|
||||
Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
|
||||
@ -205,6 +206,7 @@ Shawn O. Pearce <spearce@spearce.org>
|
||||
Simon Hausmann <hausmann@kde.org> <simon@lst.de>
|
||||
Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com>
|
||||
Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com>
|
||||
Stefan Beller <stefanbeller@gmail.com> <sbeller@google.com>
|
||||
Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
|
||||
Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com>
|
||||
Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
|
||||
|
@ -1,5 +1,5 @@
|
||||
Like other projects, we also have some guidelines to keep to the
|
||||
code. For Git in general, three rough rules are:
|
||||
code. For Git in general, a few rough rules are:
|
||||
|
||||
- Most importantly, we never say "It's in POSIX; we'll happily
|
||||
ignore your needs should your system not conform to it."
|
||||
@ -328,9 +328,14 @@ For C programs:
|
||||
|
||||
- When you come up with an API, document it.
|
||||
|
||||
- The first #include in C files, except in platform specific
|
||||
compat/ implementations, should be git-compat-util.h or another
|
||||
header file that includes it, such as cache.h or builtin.h.
|
||||
- The first #include in C files, except in platform specific compat/
|
||||
implementations, must be either "git-compat-util.h", "cache.h" or
|
||||
"builtin.h". You do not have to include more than one of these.
|
||||
|
||||
- A C file must directly include the header files that declare the
|
||||
functions and the types it uses, except for the functions and types
|
||||
that are made available to it by including one of the header files
|
||||
it must include by the previous rule.
|
||||
|
||||
- If you are planning a new command, consider writing it in shell
|
||||
or perl first, so that changes in semantics can be easily
|
||||
@ -413,6 +418,29 @@ Error Messages
|
||||
- Say what the error is first ("cannot open %s", not "%s: cannot open")
|
||||
|
||||
|
||||
Externally Visible Names
|
||||
|
||||
- For configuration variable names, follow the existing convention:
|
||||
|
||||
. The section name indicates the affected subsystem.
|
||||
|
||||
. The subsection name, if any, indicates which of an unbounded set
|
||||
of things to set the value for.
|
||||
|
||||
. The variable name describes the effect of tweaking this knob.
|
||||
|
||||
The section and variable names that consist of multiple words are
|
||||
formed by concatenating the words without punctuations (e.g. `-`),
|
||||
and are broken using bumpyCaps in documentation as a hint to the
|
||||
reader.
|
||||
|
||||
When choosing the variable namespace, do not use variable name for
|
||||
specifying possibly unbounded set of things, most notably anything
|
||||
an end user can freely come up with (e.g. branch names). Instead,
|
||||
use subsection names or variable values, like the existing variable
|
||||
branch.<name>.description does.
|
||||
|
||||
|
||||
Writing Documentation:
|
||||
|
||||
Most (if not all) of the documentation pages are written in the
|
||||
@ -441,6 +469,10 @@ Writing Documentation:
|
||||
--sort=<key>
|
||||
--abbrev[=<n>]
|
||||
|
||||
If a placeholder has multiple words, they are separated by dashes:
|
||||
<new-branch-name>
|
||||
--template=<template-directory>
|
||||
|
||||
Possibility of multiple occurrences is indicated by three dots:
|
||||
<file>...
|
||||
(One or more of <file>.)
|
||||
@ -457,12 +489,12 @@ Writing Documentation:
|
||||
(Zero or more of <patch>. Note that the dots are inside, not
|
||||
outside the brackets.)
|
||||
|
||||
Multiple alternatives are indicated with vertical bar:
|
||||
Multiple alternatives are indicated with vertical bars:
|
||||
[-q | --quiet]
|
||||
[--utf8 | --no-utf8]
|
||||
|
||||
Parentheses are used for grouping:
|
||||
[(<rev>|<range>)...]
|
||||
[(<rev> | <range>)...]
|
||||
(Any number of either <rev> or <range>. Parens are needed to make
|
||||
it clear that "..." pertains to both <rev> and <range>.)
|
||||
|
||||
@ -494,7 +526,7 @@ Writing Documentation:
|
||||
`backticks around word phrases`, do so.
|
||||
`--pretty=oneline`
|
||||
`git rev-list`
|
||||
`remote.pushdefault`
|
||||
`remote.pushDefault`
|
||||
|
||||
Word phrases enclosed in `backtick characters` are rendered literally
|
||||
and will not be further expanded. The use of `backticks` to achieve the
|
||||
|
@ -5,6 +5,7 @@ MAN7_TXT =
|
||||
TECH_DOCS =
|
||||
ARTICLES =
|
||||
SP_ARTICLES =
|
||||
OBSOLETE_HTML =
|
||||
|
||||
MAN1_TXT += $(filter-out \
|
||||
$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
|
||||
@ -26,6 +27,7 @@ MAN7_TXT += gitcore-tutorial.txt
|
||||
MAN7_TXT += gitcredentials.txt
|
||||
MAN7_TXT += gitcvs-migration.txt
|
||||
MAN7_TXT += gitdiffcore.txt
|
||||
MAN7_TXT += giteveryday.txt
|
||||
MAN7_TXT += gitglossary.txt
|
||||
MAN7_TXT += gitnamespaces.txt
|
||||
MAN7_TXT += gitrevisions.txt
|
||||
@ -37,11 +39,11 @@ MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
|
||||
MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))
|
||||
MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
|
||||
|
||||
OBSOLETE_HTML = git-remote-helpers.html
|
||||
OBSOLETE_HTML += everyday.html
|
||||
OBSOLETE_HTML += git-remote-helpers.html
|
||||
DOC_HTML = $(MAN_HTML) $(OBSOLETE_HTML)
|
||||
|
||||
ARTICLES += howto-index
|
||||
ARTICLES += everyday
|
||||
ARTICLES += git-tools
|
||||
ARTICLES += git-bisect-lk2009
|
||||
# with their own formatting rules.
|
||||
@ -97,6 +99,13 @@ man7dir = $(mandir)/man7
|
||||
|
||||
ASCIIDOC = asciidoc
|
||||
ASCIIDOC_EXTRA =
|
||||
ASCIIDOC_HTML = xhtml11
|
||||
ASCIIDOC_DOCBOOK = docbook
|
||||
ASCIIDOC_CONF = -f asciidoc.conf
|
||||
ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
|
||||
-agit_version=$(GIT_VERSION)
|
||||
TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
|
||||
TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
|
||||
MANPAGE_XSL = manpage-normal.xsl
|
||||
XMLTO = xmlto
|
||||
XMLTO_EXTRA =
|
||||
@ -304,14 +313,12 @@ clean:
|
||||
|
||||
$(MAN_HTML): %.html : %.txt asciidoc.conf
|
||||
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
|
||||
$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
|
||||
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
|
||||
$(TXT_TO_HTML) -d manpage -o $@+ $< && \
|
||||
mv $@+ $@
|
||||
|
||||
$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
|
||||
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
|
||||
$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
|
||||
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
|
||||
$(TXT_TO_HTML) -o $@+ $< && \
|
||||
mv $@+ $@
|
||||
|
||||
manpage-base-url.xsl: manpage-base-url.xsl.in
|
||||
@ -323,13 +330,12 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
|
||||
|
||||
%.xml : %.txt asciidoc.conf
|
||||
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
|
||||
$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
|
||||
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
|
||||
$(TXT_TO_XML) -d manpage -o $@+ $< && \
|
||||
mv $@+ $@
|
||||
|
||||
user-manual.xml: user-manual.txt user-manual.conf
|
||||
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
|
||||
$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d article -o $@+ $< && \
|
||||
$(TXT_TO_XML) -d article -o $@+ $< && \
|
||||
mv $@+ $@
|
||||
|
||||
technical/api-index.txt: technical/api-index-skel.txt \
|
||||
@ -338,8 +344,7 @@ technical/api-index.txt: technical/api-index-skel.txt \
|
||||
|
||||
technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
|
||||
$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt asciidoc.conf
|
||||
$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
|
||||
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt
|
||||
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
|
||||
|
||||
XSLT = docbook.xsl
|
||||
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
|
||||
@ -386,14 +391,15 @@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
|
||||
mv $@+ $@
|
||||
|
||||
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
|
||||
$(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 $*.txt
|
||||
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
|
||||
|
||||
WEBDOC_DEST = /pub/software/scm/git/docs
|
||||
|
||||
howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
|
||||
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
|
||||
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
|
||||
sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \
|
||||
sed -e '1,/^$$/d' $< | \
|
||||
$(TXT_TO_HTML) - >$@+ && \
|
||||
mv $@+ $@
|
||||
|
||||
install-webdoc : html
|
||||
|
34
Documentation/RelNotes/1.8.5.6.txt
Normal file
34
Documentation/RelNotes/1.8.5.6.txt
Normal file
@ -0,0 +1,34 @@
|
||||
Git v1.8.5.6 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.8.5.5
|
||||
--------------------
|
||||
|
||||
* We used to allow committing a path ".Git/config" with Git that is
|
||||
running on a case sensitive filesystem, but an attempt to check out
|
||||
such a path with Git that runs on a case insensitive filesystem
|
||||
would have clobbered ".git/config", which is definitely not what
|
||||
the user would have expected. Git now prevents you from tracking
|
||||
a path with ".Git" (in any case combination) as a path component.
|
||||
|
||||
* On Windows, certain path components that are different from ".git"
|
||||
are mapped to ".git", e.g. "git~1/config" is treated as if it were
|
||||
".git/config". HFS+ has a similar issue, where certain unicode
|
||||
codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
|
||||
it were ".git/config". Pathnames with these potential issues are
|
||||
rejected on the affected systems. Git on systems that are not
|
||||
affected by this issue (e.g. Linux) can also be configured to
|
||||
reject them to ensure cross platform interoperability of the hosted
|
||||
projects.
|
||||
|
||||
* "git fsck" notices a tree object that records such a path that can
|
||||
be confused with ".git", and with receive.fsckObjects configuration
|
||||
set to true, an attempt to "git push" such a tree object will be
|
||||
rejected. Such a path may not be a problem on a well behaving
|
||||
filesystem but in order to protect those on HFS+ and on case
|
||||
insensitive filesystems, this check is enabled on all platforms.
|
||||
|
||||
A big "thanks!" for bringing this issue to us goes to our friends in
|
||||
the Mercurial land, namely, Matt Mackall and Augie Fackler.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
34
Documentation/RelNotes/1.9.5.txt
Normal file
34
Documentation/RelNotes/1.9.5.txt
Normal file
@ -0,0 +1,34 @@
|
||||
Git v1.9.5 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v1.9.4
|
||||
------------------
|
||||
|
||||
* We used to allow committing a path ".Git/config" with Git that is
|
||||
running on a case sensitive filesystem, but an attempt to check out
|
||||
such a path with Git that runs on a case insensitive filesystem
|
||||
would have clobbered ".git/config", which is definitely not what
|
||||
the user would have expected. Git now prevents you from tracking
|
||||
a path with ".Git" (in any case combination) as a path component.
|
||||
|
||||
* On Windows, certain path components that are different from ".git"
|
||||
are mapped to ".git", e.g. "git~1/config" is treated as if it were
|
||||
".git/config". HFS+ has a similar issue, where certain unicode
|
||||
codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
|
||||
it were ".git/config". Pathnames with these potential issues are
|
||||
rejected on the affected systems. Git on systems that are not
|
||||
affected by this issue (e.g. Linux) can also be configured to
|
||||
reject them to ensure cross platform interoperability of the hosted
|
||||
projects.
|
||||
|
||||
* "git fsck" notices a tree object that records such a path that can
|
||||
be confused with ".git", and with receive.fsckObjects configuration
|
||||
set to true, an attempt to "git push" such a tree object will be
|
||||
rejected. Such a path may not be a problem on a well behaving
|
||||
filesystem but in order to protect those on HFS+ and on case
|
||||
insensitive filesystems, this check is enabled on all platforms.
|
||||
|
||||
A big "thanks!" for bringing this issue to us goes to our friends in
|
||||
the Mercurial land, namely, Matt Mackall and Augie Fackler.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
34
Documentation/RelNotes/2.0.5.txt
Normal file
34
Documentation/RelNotes/2.0.5.txt
Normal file
@ -0,0 +1,34 @@
|
||||
Git v2.0.5 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.0.4
|
||||
------------------
|
||||
|
||||
* We used to allow committing a path ".Git/config" with Git that is
|
||||
running on a case sensitive filesystem, but an attempt to check out
|
||||
such a path with Git that runs on a case insensitive filesystem
|
||||
would have clobbered ".git/config", which is definitely not what
|
||||
the user would have expected. Git now prevents you from tracking
|
||||
a path with ".Git" (in any case combination) as a path component.
|
||||
|
||||
* On Windows, certain path components that are different from ".git"
|
||||
are mapped to ".git", e.g. "git~1/config" is treated as if it were
|
||||
".git/config". HFS+ has a similar issue, where certain unicode
|
||||
codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
|
||||
it were ".git/config". Pathnames with these potential issues are
|
||||
rejected on the affected systems. Git on systems that are not
|
||||
affected by this issue (e.g. Linux) can also be configured to
|
||||
reject them to ensure cross platform interoperability of the hosted
|
||||
projects.
|
||||
|
||||
* "git fsck" notices a tree object that records such a path that can
|
||||
be confused with ".git", and with receive.fsckObjects configuration
|
||||
set to true, an attempt to "git push" such a tree object will be
|
||||
rejected. Such a path may not be a problem on a well behaving
|
||||
filesystem but in order to protect those on HFS+ and on case
|
||||
insensitive filesystems, this check is enabled on all platforms.
|
||||
|
||||
A big "thanks!" for bringing this issue to us goes to our friends in
|
||||
the Mercurial land, namely, Matt Mackall and Augie Fackler.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
44
Documentation/RelNotes/2.1.1.txt
Normal file
44
Documentation/RelNotes/2.1.1.txt
Normal file
@ -0,0 +1,44 @@
|
||||
Git v2.1.1 Release Notes
|
||||
========================
|
||||
|
||||
* Git 2.0 had a regression where "git fetch" into a shallowly
|
||||
cloned repository from a repository with bitmap object index
|
||||
enabled did not work correctly. This has been corrected.
|
||||
|
||||
* Git 2.0 had a regression which broke (rarely used) "git diff-tree
|
||||
-t". This has been corrected.
|
||||
|
||||
* "git log --pretty/format=" with an empty format string did not
|
||||
mean the more obvious "No output whatsoever" but "Use default
|
||||
format", which was counterintuitive. Now it means "nothing shown
|
||||
for the log message part".
|
||||
|
||||
* "git -c section.var command" and "git -c section.var= command"
|
||||
should pass the configuration differently (the former should be a
|
||||
boolean true, the latter should be an empty string), but they
|
||||
didn't work that way. Now it does.
|
||||
|
||||
* Applying a patch not generated by Git in a subdirectory used to
|
||||
check the whitespace breakage using the attributes for incorrect
|
||||
paths. Also whitespace checks were performed even for paths
|
||||
excluded via "git apply --exclude=<path>" mechanism.
|
||||
|
||||
* "git bundle create" with date-range specification were meant to
|
||||
exclude tags outside the range, but it did not work correctly.
|
||||
|
||||
* "git add x" where x that used to be a directory has become a
|
||||
symbolic link to a directory misbehaved.
|
||||
|
||||
* The prompt script checked $GIT_DIR/ref/stash file to see if there
|
||||
is a stash, which was a no-no.
|
||||
|
||||
* "git checkout -m" did not switch to another branch while carrying
|
||||
the local changes forward when a path was deleted from the index.
|
||||
|
||||
* With sufficiently long refnames, fast-import could have overflown
|
||||
an on-stack buffer.
|
||||
|
||||
* After "pack-refs --prune" packed refs at the top-level, it failed
|
||||
to prune them.
|
||||
|
||||
* "git gc --auto" triggered from "git fetch --quiet" was not quiet.
|
20
Documentation/RelNotes/2.1.2.txt
Normal file
20
Documentation/RelNotes/2.1.2.txt
Normal file
@ -0,0 +1,20 @@
|
||||
Git v2.1.2 Release Notes
|
||||
========================
|
||||
|
||||
* "git push" over HTTP transport had an artificial limit on number of
|
||||
refs that can be pushed imposed by the command line length.
|
||||
|
||||
* When receiving an invalid pack stream that records the same object
|
||||
twice, multiple threads got confused due to a race.
|
||||
|
||||
* An attempt to remove the entire tree in the "git fast-import" input
|
||||
stream caused it to misbehave.
|
||||
|
||||
* Reachability check (used in "git prune" and friends) did not add a
|
||||
detached HEAD as a starting point to traverse objects still in use.
|
||||
|
||||
* "git config --add section.var val" used to lose existing
|
||||
section.var whose value was an empty string.
|
||||
|
||||
* "git fsck" failed to report that it found corrupt objects via its
|
||||
exit status in some cases.
|
26
Documentation/RelNotes/2.1.3.txt
Normal file
26
Documentation/RelNotes/2.1.3.txt
Normal file
@ -0,0 +1,26 @@
|
||||
Git v2.1.3 Release Notes
|
||||
========================
|
||||
|
||||
* Some MUAs mangled a line in a message that begins with "From " to
|
||||
">From " when writing to a mailbox file and feeding such an input to
|
||||
"git am" used to lose such a line.
|
||||
|
||||
* "git daemon" (with NO_IPV6 build configuration) used to incorrectly
|
||||
use the hostname even when gethostbyname() reported that the given
|
||||
hostname is not found.
|
||||
|
||||
* Newer versions of 'meld' breaks the auto-detection we use to see if
|
||||
they are new enough to support the `--output` option.
|
||||
|
||||
* "git pack-objects" forgot to disable the codepath to generate
|
||||
object recheability bitmap when it needs to split the resulting
|
||||
pack.
|
||||
|
||||
* "gitweb" used deprecated CGI::startfrom, which was removed from
|
||||
CGI.pm as of 4.04; use CGI::start_from instead.
|
||||
|
||||
* "git log" documentation had an example section marked up not
|
||||
quite correctly, which passed AsciiDoc but failed with
|
||||
AsciiDoctor.
|
||||
|
||||
Also contains some documentation updates.
|
34
Documentation/RelNotes/2.1.4.txt
Normal file
34
Documentation/RelNotes/2.1.4.txt
Normal file
@ -0,0 +1,34 @@
|
||||
Git v2.1.4 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.1.3
|
||||
------------------
|
||||
|
||||
* We used to allow committing a path ".Git/config" with Git that is
|
||||
running on a case sensitive filesystem, but an attempt to check out
|
||||
such a path with Git that runs on a case insensitive filesystem
|
||||
would have clobbered ".git/config", which is definitely not what
|
||||
the user would have expected. Git now prevents you from tracking
|
||||
a path with ".Git" (in any case combination) as a path component.
|
||||
|
||||
* On Windows, certain path components that are different from ".git"
|
||||
are mapped to ".git", e.g. "git~1/config" is treated as if it were
|
||||
".git/config". HFS+ has a similar issue, where certain unicode
|
||||
codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
|
||||
it were ".git/config". Pathnames with these potential issues are
|
||||
rejected on the affected systems. Git on systems that are not
|
||||
affected by this issue (e.g. Linux) can also be configured to
|
||||
reject them to ensure cross platform interoperability of the hosted
|
||||
projects.
|
||||
|
||||
* "git fsck" notices a tree object that records such a path that can
|
||||
be confused with ".git", and with receive.fsckObjects configuration
|
||||
set to true, an attempt to "git push" such a tree object will be
|
||||
rejected. Such a path may not be a problem on a well behaving
|
||||
filesystem but in order to protect those on HFS+ and on case
|
||||
insensitive filesystems, this check is enabled on all platforms.
|
||||
|
||||
A big "thanks!" for bringing this issue to us goes to our friends in
|
||||
the Mercurial land, namely, Matt Mackall and Augie Fackler.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
313
Documentation/RelNotes/2.2.0.txt
Normal file
313
Documentation/RelNotes/2.2.0.txt
Normal file
@ -0,0 +1,313 @@
|
||||
Git v2.2 Release Notes
|
||||
======================
|
||||
|
||||
Updates since v2.1
|
||||
------------------
|
||||
|
||||
Ports
|
||||
|
||||
* Building on older MacOS X systems automatically sets
|
||||
the necessary NO_APPLE_COMMON_CRYPTO build-time option.
|
||||
|
||||
* Building with NO_PTHREADS has been resurrected.
|
||||
|
||||
* Compilation options have been updated a bit to better support the
|
||||
z/OS port.
|
||||
|
||||
|
||||
UI, Workflows & Features
|
||||
|
||||
* "git archive" learned to filter what gets archived with a pathspec.
|
||||
|
||||
* "git config --edit --global" starts from a skeletal per-user
|
||||
configuration file contents, instead of a total blank, when the
|
||||
user does not already have any global config. This immediately
|
||||
reduces the need to later ask "Have you forgotten to set
|
||||
core.user?", and we can add more to the template as we gain
|
||||
more experience.
|
||||
|
||||
* "git stash list -p" used to be almost always a no-op because each
|
||||
stash entry is represented as a merge commit. It learned to show
|
||||
the difference between the base commit version and the working tree
|
||||
version, which is in line with what "git stash show" gives.
|
||||
|
||||
* Sometimes users want to report a bug they experience on their
|
||||
repository, but they are not at liberty to share the contents of
|
||||
the repository. "fast-export" was taught an "--anonymize" option
|
||||
to replace blob contents, names of people, paths and log
|
||||
messages with bland and simple strings to help them.
|
||||
|
||||
* "git difftool" learned an option to stop feeding paths to the
|
||||
diff backend when it exits with a non-zero status.
|
||||
|
||||
* "git grep" learned to paint (or not paint) partial matches on
|
||||
context lines when showing "grep -C<num>" output in color.
|
||||
|
||||
* "log --date=iso" uses a slight variant of the ISO 8601 format that is
|
||||
more human readable. A new "--date=iso-strict" option gives
|
||||
datetime output that conforms more strictly.
|
||||
|
||||
* The logic "git prune" uses is more resilient against various corner
|
||||
cases.
|
||||
|
||||
* A broken reimplementation of Git could write an invalid index that
|
||||
records both stage #0 and higher-stage entries for the same path.
|
||||
We now notice and reject such an index, as there is no sensible
|
||||
fallback (we do not know if the broken tool wanted to resolve and
|
||||
forgot to remove the higher-stage entries, or if it wanted to unresolve
|
||||
and forgot to remove the stage #0 entry).
|
||||
|
||||
* The temporary files "git mergetool" uses are renamed to avoid too
|
||||
many dots in them (e.g. a temporary file for "hello.c" used to be
|
||||
named e.g. "hello.BASE.4321.c" but now uses underscore instead,
|
||||
e.g. "hello_BASE_4321.c", to allow us to have multiple variants).
|
||||
|
||||
* The temporary files "git mergetool" uses can be placed in a newly
|
||||
created temporary directory, instead of the current directory, by
|
||||
setting the mergetool.writeToTemp configuration variable.
|
||||
|
||||
* "git mergetool" understands "--tool bc" now, as version 4 of
|
||||
BeyondCompare can be driven the same way as its version 3 and it
|
||||
feels awkward to say "--tool bc3" to run version 4.
|
||||
|
||||
* The "pre-receive" and "post-receive" hooks are no longer required
|
||||
to consume their input fully (not following this requirement used
|
||||
to result in intermittent errors in "git push").
|
||||
|
||||
* The pretty-format specifier "%d", which expands to " (tagname)"
|
||||
for a tagged commit, gained a cousin "%D" that just gives the
|
||||
"tagname" without frills.
|
||||
|
||||
* "git push" learned "--signed" push, that allows a push (i.e.
|
||||
request to update the refs on the other side to point at a new
|
||||
history, together with the transmission of necessary objects) to be
|
||||
signed, so that it can be verified and audited, using the GPG
|
||||
signature of the person who pushed, that the tips of branches at a
|
||||
public repository really point the commits the pusher wanted to,
|
||||
without having to "trust" the server.
|
||||
|
||||
* "git interpret-trailers" is a new filter to programmatically edit
|
||||
the tail end of the commit log messages, e.g. "Signed-off-by:".
|
||||
|
||||
* "git help everyday" shows the "Everyday Git in 20 commands or so"
|
||||
document, whose contents have been updated to match more modern
|
||||
Git practice.
|
||||
|
||||
* On the "git svn" front, work progresses to reduce memory consumption and
|
||||
to improve handling of mergeinfo.
|
||||
|
||||
|
||||
Performance, Internal Implementation, Development Support etc.
|
||||
|
||||
* The API to manipulate the "refs" has been restructured to make it
|
||||
more transactional, with the eventual goal to allow all-or-none
|
||||
atomic updates and migrating the storage to something other than
|
||||
the traditional filesystem based one (e.g. databases).
|
||||
|
||||
* The lockfile API and its users have been cleaned up.
|
||||
|
||||
* We no longer attempt to keep track of individual dependencies to
|
||||
the header files in the build procedure, relying instead on automated
|
||||
dependency generation support from modern compilers.
|
||||
|
||||
* In tests, we have been using NOT_{MINGW,CYGWIN} test prerequisites
|
||||
long before negated prerequisites e.g. !MINGW were invented.
|
||||
The former has been converted to the latter to avoid confusion.
|
||||
|
||||
* Optimized looking up a remote's configuration in a repository with very many
|
||||
remotes defined.
|
||||
|
||||
* There are cases where you lock and open to write a file, close it
|
||||
to show the updated contents to an external processes, and then have
|
||||
to update the file again while still holding the lock; now the
|
||||
lockfile API has support for such an access pattern.
|
||||
|
||||
* The API to allocate the structure to keep track of commit
|
||||
decoration has been updated to make it less cumbersome to use.
|
||||
|
||||
* An in-core caching layer to let us avoid reading the same
|
||||
configuration files several times has been added. A few commands
|
||||
have been converted to use this subsystem.
|
||||
|
||||
* Various code paths have been cleaned up and simplified by using
|
||||
the "strbuf", "starts_with()", and "skip_prefix()" APIs more.
|
||||
|
||||
* A few codepaths that died when large blobs that would not fit in
|
||||
core are involved in their operation have been taught to punt
|
||||
instead, by e.g. marking a too-large blob as not to be diffed.
|
||||
|
||||
* A few more code paths in "commit" and "checkout" have been taught
|
||||
to repopulate the cache-tree in the index, to help speed up later
|
||||
"write-tree" (used in "commit") and "diff-index --cached" (used in
|
||||
"status").
|
||||
|
||||
* A common programming mistake to assign the same short option name
|
||||
to two separate options is detected by the parse_options() API to help
|
||||
developers.
|
||||
|
||||
* The code path to write out the packed-refs file has been optimized,
|
||||
which especially matters in a repository with a large number of
|
||||
refs.
|
||||
|
||||
* The check to see if a ref $F can be created by making sure no
|
||||
existing ref has $F/ as its prefix has been optimized, which
|
||||
especially matters in a repository with a large number of existing
|
||||
refs.
|
||||
|
||||
* "git fsck" was taught to check the contents of tag objects a bit more.
|
||||
|
||||
* "git hash-object" was taught a "--literally" option to help
|
||||
debugging.
|
||||
|
||||
* When running a required clean filter, we do not have to mmap the
|
||||
original before feeding the filter. Instead, stream the file
|
||||
contents directly to the filter and process its output.
|
||||
|
||||
* The scripts in the test suite can be run with the "-x" option to show
|
||||
a shell-trace of each command they run.
|
||||
|
||||
* The "run-command" API learned to manage the argv and environment
|
||||
arrays for child process, alleviating the need for the callers to
|
||||
allocate and deallocate them.
|
||||
|
||||
* Some people use AsciiDoctor, instead of AsciiDoc, to format our
|
||||
documentation set; the documentation has been adjusted to be usable
|
||||
by both, as AsciiDoctor is pickier than AsciiDoc about its input
|
||||
mark-up.
|
||||
|
||||
|
||||
Also contains various documentation updates and code clean-ups.
|
||||
|
||||
|
||||
Fixes since v2.1
|
||||
----------------
|
||||
|
||||
Unless otherwise noted, all the fixes since v2.1 in the maintenance
|
||||
track are contained in this release (see the maintenance releases'
|
||||
notes for details).
|
||||
|
||||
* "git log --pretty/format=" with an empty format string did not
|
||||
mean the more obvious "No output whatsoever" but "Use default
|
||||
format", which was counterintuitive.
|
||||
|
||||
* "git -c section.var command" and "git -c section.var= command"
|
||||
should pass the configuration value differently (the former should be a
|
||||
boolean true, the latter should be an empty string).
|
||||
|
||||
* Applying a patch not generated by Git in a subdirectory used to
|
||||
check for whitespace breakage using the attributes of incorrect
|
||||
paths. Also whitespace checks were performed even for paths
|
||||
excluded via the "git apply --exclude=<path>" mechanism.
|
||||
|
||||
* "git bundle create" with a date-range specification was meant to
|
||||
exclude tags outside the range, but it didn't.
|
||||
|
||||
* "git add x" where x used to be a directory and is now a
|
||||
symbolic link to a directory misbehaved.
|
||||
|
||||
* The prompt script checked the $GIT_DIR/ref/stash file to see if there
|
||||
is a stash, which was a no-no.
|
||||
|
||||
* Pack-protocol documentation had a minor typo.
|
||||
|
||||
* "git checkout -m" did not switch to another branch while carrying
|
||||
the local changes forward when a path was deleted from the index.
|
||||
|
||||
* "git daemon" (with NO_IPV6 build configuration) used to incorrectly
|
||||
use the hostname even when gethostbyname() reported that the given
|
||||
hostname is not found.
|
||||
(merge 107efbe rs/daemon-fixes later to maint).
|
||||
|
||||
* With sufficiently long refnames, "git fast-import" could have
|
||||
overflowed an on-stack buffer.
|
||||
|
||||
* After "pack-refs --prune" packed refs at the top-level, it failed
|
||||
to prune them.
|
||||
|
||||
* Progress output from "git gc --auto" was visible in "git fetch -q".
|
||||
|
||||
* We used to pass -1000 to poll(2), expecting it to also mean "no
|
||||
timeout", which should be spelled as -1.
|
||||
|
||||
* "git rebase" documentation was unclear that it is required to
|
||||
specify on what <upstream> the rebase is to be done when telling it
|
||||
to first check out <branch>.
|
||||
(merge 95c6826 so/rebase-doc later to maint).
|
||||
|
||||
* "git push" over HTTP transport had an artificial limit on the number of
|
||||
refs that can be pushed, imposed by the command line length.
|
||||
(merge 26be19b jk/send-pack-many-refspecs later to maint).
|
||||
|
||||
* When receiving an invalid pack stream that records the same object
|
||||
twice, multiple threads got confused due to a race.
|
||||
(merge ab791dd jk/index-pack-threading-races later to maint).
|
||||
|
||||
* An attempt to remove the entire tree in the "git fast-import" input
|
||||
stream caused it to misbehave.
|
||||
(merge 2668d69 mb/fast-import-delete-root later to maint).
|
||||
|
||||
* Reachability check (used in "git prune" and friends) did not add a
|
||||
detached HEAD as a starting point to traverse objects still in use.
|
||||
(merge c40fdd0 mk/reachable-protect-detached-head later to maint).
|
||||
|
||||
* "git config --add section.var val" when section.var already has an
|
||||
empty-string value used to lose the empty-string value.
|
||||
(merge c1063be ta/config-add-to-empty-or-true-fix later to maint).
|
||||
|
||||
* "git fsck" failed to report that it found corrupt objects via its
|
||||
exit status in some cases.
|
||||
(merge 30d1038 jk/fsck-exit-code-fix later to maint).
|
||||
|
||||
* Use of the "--verbose" option used to break "git branch --merged".
|
||||
(merge 12994dd jk/maint-branch-verbose-merged later to maint).
|
||||
|
||||
* Some MUAs mangle a line in a message that begins with "From " to
|
||||
">From " when writing to a mailbox file, and feeding such an input
|
||||
to "git am" used to lose such a line.
|
||||
(merge 85de86a jk/mbox-from-line later to maint).
|
||||
|
||||
* "rev-parse --verify --quiet $name" is meant to quietly exit with a
|
||||
non-zero status when $name is not a valid object name, but still
|
||||
gave error messages in some cases.
|
||||
|
||||
* A handful of C source files have been updated to include
|
||||
"git-compat-util.h" as the first thing, to conform better to our
|
||||
coding guidelines.
|
||||
(merge 1c4b660 da/include-compat-util-first-in-c later to maint).
|
||||
|
||||
* The t7004 test, which tried to run Git with small stack space, has been
|
||||
updated to use a bit larger stack to avoid false breakage on some
|
||||
platforms.
|
||||
(merge b9a1907 sk/tag-contains-wo-recursion later to maint).
|
||||
|
||||
* A few documentation pages had example sections marked up not quite
|
||||
correctly, which passed AsciiDoc but failed with AsciiDoctor.
|
||||
(merge c30c43c bc/asciidoc-pretty-formats-fix later to maint).
|
||||
(merge f8a48af bc/asciidoc later to maint).
|
||||
|
||||
* "gitweb" used deprecated CGI::startfrom, which was removed from
|
||||
CGI.pm as of 4.04; use CGI::start_from instead.
|
||||
(merge 4750f4b rm/gitweb-start-form later to maint).
|
||||
|
||||
* Newer versions of 'meld' break the auto-detection we use to see if
|
||||
they are new enough to support the `--output` option.
|
||||
(merge b12d045 da/mergetool-meld later to maint).
|
||||
|
||||
* "git pack-objects" forgot to disable the codepath to generate the
|
||||
object reachability bitmap when it needs to split the resulting
|
||||
pack.
|
||||
(merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint).
|
||||
|
||||
* The code to use cache-tree trusted the on-disk data too much and
|
||||
fell into an infinite loop upon seeing an incorrectly recorded
|
||||
index file.
|
||||
(merge 729dbbd jk/cache-tree-protect-from-broken-libgit2 later to maint).
|
||||
|
||||
* "git fetch" into a repository where branch B was deleted earlier,
|
||||
back when it had reflog enabled, and then branch B/C is fetched
|
||||
into it without reflog enabled, which is arguably an unlikely
|
||||
corner case, unnecessarily failed.
|
||||
(merge aae828b jk/fetch-reflog-df-conflict later to maint).
|
||||
|
||||
* "git log --first-parent -L..." used to crash.
|
||||
(merge a8787c5 tm/line-log-first-parent later to maint).
|
34
Documentation/RelNotes/2.2.1.txt
Normal file
34
Documentation/RelNotes/2.2.1.txt
Normal file
@ -0,0 +1,34 @@
|
||||
Git v2.2.1 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.2
|
||||
----------------
|
||||
|
||||
* We used to allow committing a path ".Git/config" with Git that is
|
||||
running on a case sensitive filesystem, but an attempt to check out
|
||||
such a path with Git that runs on a case insensitive filesystem
|
||||
would have clobbered ".git/config", which is definitely not what
|
||||
the user would have expected. Git now prevents you from tracking
|
||||
a path with ".Git" (in any case combination) as a path component.
|
||||
|
||||
* On Windows, certain path components that are different from ".git"
|
||||
are mapped to ".git", e.g. "git~1/config" is treated as if it were
|
||||
".git/config". HFS+ has a similar issue, where certain unicode
|
||||
codepoints are ignored, e.g. ".g\u200cit/config" is treated as if
|
||||
it were ".git/config". Pathnames with these potential issues are
|
||||
rejected on the affected systems. Git on systems that are not
|
||||
affected by this issue (e.g. Linux) can also be configured to
|
||||
reject them to ensure cross platform interoperability of the hosted
|
||||
projects.
|
||||
|
||||
* "git fsck" notices a tree object that records such a path that can
|
||||
be confused with ".git", and with receive.fsckObjects configuration
|
||||
set to true, an attempt to "git push" such a tree object will be
|
||||
rejected. Such a path may not be a problem on a well behaving
|
||||
filesystem but in order to protect those on HFS+ and on case
|
||||
insensitive filesystems, this check is enabled on all platforms.
|
||||
|
||||
A big "thanks!" for bringing this issue to us goes to our friends in
|
||||
the Mercurial land, namely, Matt Mackall and Augie Fackler.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
63
Documentation/RelNotes/2.2.2.txt
Normal file
63
Documentation/RelNotes/2.2.2.txt
Normal file
@ -0,0 +1,63 @@
|
||||
Git v2.2.2 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.2.1
|
||||
------------------
|
||||
|
||||
* "git checkout $treeish $path", when $path in the index and the
|
||||
working tree already matched what is in $treeish at the $path,
|
||||
still overwrote the $path unnecessarily.
|
||||
|
||||
* "git config --get-color" did not parse its command line arguments
|
||||
carefully.
|
||||
|
||||
* open() emulated on Windows platforms did not give EISDIR upon
|
||||
an attempt to open a directory for writing.
|
||||
|
||||
* A few code paths used abs() when they should have used labs() on
|
||||
long integers.
|
||||
|
||||
* "gitweb" used to depend on a behaviour recent CGI.pm deprecated.
|
||||
|
||||
* "git init" (hence "git clone") initialized the per-repository
|
||||
configuration file .git/config with x-bit by mistake.
|
||||
|
||||
* Git 2.0 was supposed to make the "simple" mode for the default of
|
||||
"git push", but it didn't.
|
||||
|
||||
* "Everyday" document had a broken link.
|
||||
|
||||
* The build procedure did not bother fixing perl and python scripts
|
||||
when NO_PERL and NO_PYTHON build-time configuration changed.
|
||||
|
||||
* The code that reads the reflog from the newer to the older entries
|
||||
did not handle an entry that crosses a boundary of block it uses to
|
||||
read them correctly.
|
||||
|
||||
* "git apply" was described in the documentation to take --ignore-date
|
||||
option, which it does not.
|
||||
|
||||
* Traditionally we tried to avoid interpreting date strings given by
|
||||
the user as future dates, e.g. GIT_COMMITTER_DATE=2014-12-10 when
|
||||
used early November 2014 was taken as "October 12, 2014" because it
|
||||
is likely that a date in the future, December 10, is a mistake.
|
||||
This heuristics has been loosened to allow people to express future
|
||||
dates (most notably, --until=<date> may want to be far in the
|
||||
future) and we no longer tiebreak by future-ness of the date when
|
||||
|
||||
(1) ISO-like format is used, and
|
||||
(2) the string can make sense interpreted as both y-m-d and y-d-m.
|
||||
|
||||
Git may still have to use the heuristics to tiebreak between dd/mm/yy
|
||||
and mm/dd/yy, though.
|
||||
|
||||
* The code to abbreviate an object name to its short unique prefix
|
||||
has been optimized when no abbreviation was requested.
|
||||
|
||||
* "git add --ignore-errors ..." did not ignore an error to
|
||||
give a file that did not exist.
|
||||
|
||||
* Git did not correctly read an overlong refname from a packed refs
|
||||
file.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
9
Documentation/RelNotes/2.2.3.txt
Normal file
9
Documentation/RelNotes/2.2.3.txt
Normal file
@ -0,0 +1,9 @@
|
||||
Git v2.2.3 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.2.2
|
||||
------------------
|
||||
|
||||
* A handful of codepaths that used to use fixed-sized arrays to hold
|
||||
pathnames have been corrected to use strbuf and other mechanisms to
|
||||
allow longer pathnames without fearing overflows.
|
300
Documentation/RelNotes/2.3.0.txt
Normal file
300
Documentation/RelNotes/2.3.0.txt
Normal file
@ -0,0 +1,300 @@
|
||||
Git v2.3 Release Notes
|
||||
======================
|
||||
|
||||
This one ended up to be a release with lots of small corrections and
|
||||
improvements without big uncomfortably exciting features. The recent
|
||||
security fix that went to 2.2.1 and older maintenance tracks is also
|
||||
contained in this update.
|
||||
|
||||
|
||||
Updates since v2.2
|
||||
------------------
|
||||
|
||||
Ports
|
||||
|
||||
* Recent gcc toolchain on Cygwin started throwing compilation warning,
|
||||
which has been squelched.
|
||||
|
||||
* A few updates to build on platforms that lack tv_nsec,
|
||||
clock_gettime, CLOCK_MONOTONIC and HMAC_CTX_cleanup (e.g. older
|
||||
RHEL) have been added.
|
||||
|
||||
|
||||
UI, Workflows & Features
|
||||
|
||||
* It was cumbersome to use "GIT_SSH" mechanism when the user wanted
|
||||
to pass an extra set of arguments to the underlying ssh. A new
|
||||
environment variable GIT_SSH_COMMAND can be used for this.
|
||||
|
||||
* A request to store an empty note via "git notes" meant to remove
|
||||
note from the object but with --allow-empty we will store a
|
||||
(surprise!) note that is empty.
|
||||
|
||||
* "git interpret-trailers" learned to properly handle the
|
||||
"Conflicts:" block at the end.
|
||||
|
||||
* "git am" learned "--message-id" option to copy the message ID of
|
||||
the incoming e-mail to the log message of resulting commit.
|
||||
|
||||
* "git clone --reference=<over there>" learned the "--dissociate"
|
||||
option to go with it; it borrows objects from the reference object
|
||||
store while cloning only to reduce network traffic and then
|
||||
dissociates the resulting clone from the reference by performing
|
||||
local copies of borrowed objects.
|
||||
|
||||
* "git send-email" learned "--transfer-encoding" option to force a
|
||||
non-fault Content-Transfer-Encoding header (e.g. base64).
|
||||
|
||||
* "git send-email" normally identifies itself via X-Mailer: header in
|
||||
the message it sends out. A new command line flag --no-xmailer
|
||||
allows the user to squelch the header.
|
||||
|
||||
* "git push" into a repository with a working tree normally refuses
|
||||
to modify the branch that is checked out. The command learned to
|
||||
optionally do an equivalent of "git reset --hard" only when there
|
||||
is no change to the working tree and the index instead, which would
|
||||
be useful to "deploy" by pushing into a repository.
|
||||
|
||||
* "git new-workdir" (in contrib/) can be used to populate an empty
|
||||
and existing directory now.
|
||||
|
||||
* Credential helpers are asked in turn until one of them give
|
||||
positive response, which is cumbersome to turn off when you need to
|
||||
run Git in an automated setting. The credential helper interface
|
||||
learned to allow a helper to say "stop, don't ask other helpers."
|
||||
Also GIT_TERMINAL_PROMPT environment can be set to false to disable
|
||||
our built-in prompt mechanism for passwords.
|
||||
|
||||
* "git branch -d" (delete) and "git branch -m" (move) learned to
|
||||
honor "-f" (force) flag; unlike many other subcommands, the way to
|
||||
force these have been with separate "-D/-M" options, which was
|
||||
inconsistent.
|
||||
|
||||
* "diff-highlight" filter (in contrib/) allows its color output to be
|
||||
customized via configuration variables.
|
||||
|
||||
* "git imap-send" learned to take "-v" (verbose) and "-q" (quiet)
|
||||
command line options.
|
||||
|
||||
* "git remote add $name $URL" is now allowed when "url.$URL.insteadOf"
|
||||
is already defined.
|
||||
|
||||
* "git imap-send" now can be built to use cURL library to talk to
|
||||
IMAP servers (if the library is recent enough, of course).
|
||||
This allows you to use authenticate method other than CRAM-MD5,
|
||||
among other things.
|
||||
|
||||
* "git imap-send" now allows GIT_CURL_VERBOSE environment variable to
|
||||
control the verbosity when talking via the cURL library.
|
||||
|
||||
* The prompt script (in contrib/) learned to optionally hide prompt
|
||||
when in an ignored directory by setting GIT_PS1_HIDE_IF_PWD_IGNORED
|
||||
shell variable.
|
||||
|
||||
|
||||
Performance, Internal Implementation, Development Support etc.
|
||||
|
||||
* Earlier we made "rev-list --object-edge" more aggressively list the
|
||||
objects at the edge commits, in order to reduce number of objects
|
||||
fetched into a shallow repository, but the change affected cases
|
||||
other than "fetching into a shallow repository" and made it
|
||||
unusably slow (e.g. fetching into a normal repository should not
|
||||
have to suffer the overhead from extra processing). Limit it to a
|
||||
more specific case by introducing --objects-edge-aggressive, a new
|
||||
option to rev-list.
|
||||
|
||||
* Squelched useless compiler warnings on Mac OS X regarding the
|
||||
crypto API.
|
||||
|
||||
* The procedure to generate unicode table has been simplified.
|
||||
|
||||
* Some filesystems assign filemodes in a strange way, fooling then
|
||||
automatic "filemode trustability" check done during a new
|
||||
repository creation. The initialization codepath has been hardened
|
||||
against this issue.
|
||||
|
||||
* The codepath in "git remote update --prune" to drop many refs has
|
||||
been optimized.
|
||||
|
||||
* The API into get_merge_bases*() family of functions was easy to
|
||||
misuse, which has been corrected to make it harder to do so.
|
||||
|
||||
* Long overdue departure from the assumption that S_IFMT is shared by
|
||||
everybody made in 2005, which was necessary to port to z/OS.
|
||||
|
||||
* "git push" and "git fetch" did not communicate an overlong refname
|
||||
correctly. Now it uses 64kB sideband to accommodate longer ones.
|
||||
|
||||
* Recent GPG changes the keyring format and drops support for RFC1991
|
||||
formatted signatures, breaking our existing tests.
|
||||
|
||||
* "git-prompt" (in contrib/) used a variable from the global scope,
|
||||
possibly contaminating end-user's namespace.
|
||||
|
||||
|
||||
Also contains various documentation updates and code clean-ups.
|
||||
|
||||
|
||||
Fixes since v2.2
|
||||
----------------
|
||||
|
||||
Unless otherwise noted, all the fixes since v2.2 in the maintenance
|
||||
track are contained in this release (see the maintenance releases'
|
||||
notes for details).
|
||||
|
||||
* "git http-push" over WebDAV (aka dumb http-push) was broken in
|
||||
v2.2.2 when parsing a symbolic ref, resulting in a bogus request
|
||||
that gets rejected by recent versions of cURL library.
|
||||
(merge f6786c8 jk/http-push-symref-fix later to maint).
|
||||
|
||||
* The logic in "git bisect bad HEAD" etc. to avoid forcing the test
|
||||
of the common ancestor of bad and good commits was broken.
|
||||
(merge 07913d5 cc/bisect-rev-parsing later to maint).
|
||||
|
||||
* "git checkout-index --temp=$target $path" did not work correctly
|
||||
for paths outside the current subdirectory in the project.
|
||||
(merge 74c4de5 es/checkout-index-temp later to maint).
|
||||
|
||||
* The report from "git checkout" on a branch that builds on another
|
||||
local branch by setting its branch.*.merge to branch name (not a
|
||||
full refname) incorrectly said that the upstream is gone.
|
||||
(merge 05e7368 jc/checkout-local-track-report later to maint).
|
||||
|
||||
* With The git-prompt support (in contrib/), using the exit status of
|
||||
the last command in the prompt, e.g. PS1='$(__git_ps1) $? ', did
|
||||
not work well, because the helper function stomped on the exit
|
||||
status.
|
||||
(merge 6babe76 tf/prompt-preserve-exit-status later to maint).
|
||||
|
||||
* Recent update to "git commit" broke amending an existing commit
|
||||
with bogus author/committer lines without a valid e-mail address.
|
||||
(merge c83a509 jk/commit-date-approxidate later to maint).
|
||||
|
||||
* The lockfile API used to get confused which file to clean up when
|
||||
the process moved the $cwd after creating a lockfile.
|
||||
(merge fa137f6 nd/lockfile-absolute later to maint).
|
||||
|
||||
* Traditionally we tried to avoid interpreting date strings given by
|
||||
the user as future dates, e.g. GIT_COMMITTER_DATE=2014-12-10 when
|
||||
used early November 2014 was taken as "October 12, 2014" because it
|
||||
is likely that a date in the future, December 10, is a mistake.
|
||||
This heuristics has been loosened to allow people to express future
|
||||
dates (most notably, --until=<date> may want to be far in the
|
||||
future) and we no longer tiebreak by future-ness of the date when
|
||||
|
||||
(1) ISO-like format is used, and
|
||||
(2) the string can make sense interpreted as both y-m-d and y-d-m.
|
||||
|
||||
Git may still have to use the heuristics to tiebreak between dd/mm/yy
|
||||
and mm/dd/yy, though.
|
||||
(merge d372395 jk/approxidate-avoid-y-d-m-over-future-dates later to maint).
|
||||
|
||||
* Git did not correctly read an overlong refname from a packed refs
|
||||
file.
|
||||
(merge ea41783 jk/read-packed-refs-without-path-max later to maint).
|
||||
|
||||
* "git apply" was described in the documentation to take --ignore-date
|
||||
option, which it does not.
|
||||
(merge 0cef4e7 rw/apply-does-not-take-ignore-date later to maint).
|
||||
|
||||
* "git add -i" did not notice when the interactive command input
|
||||
stream went away and kept asking the same question.
|
||||
(merge a8bec7a jk/add-i-read-error later to maint).
|
||||
|
||||
* "git send-email" did not handle RFC 2047 encoded headers quite
|
||||
right.
|
||||
(merge ab47e2a rd/send-email-2047-fix later to maint).
|
||||
|
||||
* New tag object format validation added in 2.2 showed garbage after
|
||||
a tagname it reported in its error message.
|
||||
(merge a1e920a js/fsck-tag-validation later to maint).
|
||||
|
||||
* The code that reads the reflog from the newer to the older entries
|
||||
did not handle an entry that crosses a boundary of block it uses to
|
||||
read them correctly.
|
||||
(merge 69216bf jk/for-each-reflog-ent-reverse later to maint).
|
||||
|
||||
* "git diff -B -M" after making a new copy B out of an existing file
|
||||
A and then editing A extensively ought to report that B was created
|
||||
by copying A and A was modified, which is what "git diff -C"
|
||||
reports, but it instead said A was renamed to B and A was edited
|
||||
heavily in place. This was not just incoherent but also failed to
|
||||
apply with "git apply". The report has been corrected to match what
|
||||
"git diff -C" produces for this case.
|
||||
(merge 6936b58 jc/diff-b-m later to maint).
|
||||
|
||||
* In files we pre-populate for the user to edit with commented hints,
|
||||
a line of hint that is indented with a tab used to show as '#' (or
|
||||
any comment char), ' ' (space), and then the hint text that began
|
||||
with the tab, which some editors flag as an indentation error (tab
|
||||
following space). We now omit the space after the comment char in
|
||||
such a case.
|
||||
(merge d55aeb7 jc/strbuf-add-lines-avoid-sp-ht-sequence later to maint).
|
||||
|
||||
* "git ls-tree" does not support path selection based on negative
|
||||
pathspecs, but did not error out when negative pathspecs are given.
|
||||
(merge f1f6224 nd/ls-tree-pathspec later to maint).
|
||||
|
||||
* The function sometimes returned a non-freeable memory and some
|
||||
other times returned a piece of memory that must be freed, leading
|
||||
to inevitable leaks.
|
||||
(merge 59362e5 jc/exec-cmd-system-path-leak-fix later to maint).
|
||||
|
||||
* The code to abbreviate an object name to its short unique prefix
|
||||
has been optimized when no abbreviation was requested.
|
||||
(merge 61e704e mh/find-uniq-abbrev later to maint).
|
||||
|
||||
* "git add --ignore-errors ..." did not ignore an error to
|
||||
give a file that did not exist.
|
||||
(merge 1d31e5a mg/add-ignore-errors later to maint).
|
||||
|
||||
* "git checkout $treeish $path", when $path in the index and the
|
||||
working tree already matched what is in $treeish at the $path,
|
||||
still overwrote the $path unnecessarily.
|
||||
(merge c5326bd jk/checkout-from-tree later to maint).
|
||||
|
||||
* "git config --get-color" did not parse its command line arguments
|
||||
carefully.
|
||||
(merge cb35722 jk/colors-fix later to maint).
|
||||
|
||||
* open() emulated on Windows platforms did not give EISDIR upon
|
||||
an attempt to open a directory for writing.
|
||||
(merge ba6fad0 js/windows-open-eisdir-error later to maint).
|
||||
|
||||
* A few code paths used abs() when they should have used labs() on
|
||||
long integers.
|
||||
(merge 83915ba rs/maint-config-use-labs later to maint).
|
||||
(merge 31a8aa1 rs/receive-pack-use-labs later to maint).
|
||||
|
||||
* "gitweb" used to depend on a behaviour recent CGI.pm deprecated.
|
||||
(merge 13dbf46 jk/gitweb-with-newer-cgi-multi-param later to maint).
|
||||
|
||||
* "git init" (hence "git clone") initialized the per-repository
|
||||
configuration file .git/config with x-bit by mistake.
|
||||
(merge 1f32ecf mh/config-flip-xbit-back-after-checking later to maint).
|
||||
|
||||
* Recent update in Git 2.2 started creating objects/info/packs and
|
||||
info/refs files with permission bits tighter than user's umask.
|
||||
(merge d91175b jk/prune-packed-server-info later to maint).
|
||||
|
||||
* Git 2.0 was supposed to make the "simple" mode for the default of
|
||||
"git push", but it didn't.
|
||||
(merge 00a6fa0 jk/push-simple later to maint).
|
||||
|
||||
* "Everyday" document had a broken link.
|
||||
(merge 366c8d4 po/everyday-doc later to maint).
|
||||
|
||||
* A few test fixes.
|
||||
(merge 880ef58 jk/no-perl-tests later to maint).
|
||||
|
||||
* The build procedure did not bother fixing perl and python scripts
|
||||
when NO_PERL and NO_PYTHON build-time configuration changed.
|
||||
(merge ca2051d jk/rebuild-perl-scripts-with-no-perl-seting-change later to maint).
|
||||
|
||||
* The usage string of "git log" command was marked incorrectly for
|
||||
l10n.
|
||||
(merge e66dc0c km/log-usage-string-i18n later to maint).
|
||||
|
||||
* "git for-each-ref" mishandled --format="%(upstream:track)" when a
|
||||
branch is marked to have forked from a non-existing branch.
|
||||
(merge b6160d9 rc/for-each-ref-tracking later to maint).
|
52
Documentation/RelNotes/2.3.1.txt
Normal file
52
Documentation/RelNotes/2.3.1.txt
Normal file
@ -0,0 +1,52 @@
|
||||
Git v2.3.1 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3
|
||||
----------------
|
||||
|
||||
* The interactive "show a list and let the user choose from it"
|
||||
interface "add -i" used showed and prompted to the user even when
|
||||
the candidate list was empty, against which the only "choice" the
|
||||
user could have made was to choose nothing.
|
||||
|
||||
* "git apply --whitespace=fix" used to under-allocate the memory
|
||||
when the fix resulted in a longer text than the original patch.
|
||||
|
||||
* "git log --help" used to show rev-list options that are irrelevant
|
||||
to the "log" command.
|
||||
|
||||
* The error message from "git commit", when a non-existing author
|
||||
name was given as value to the "--author=" parameter, has been
|
||||
reworded to avoid misunderstanding.
|
||||
|
||||
* A broken pack .idx file in the receiving repository prevented the
|
||||
dumb http transport from fetching a good copy of it from the other
|
||||
side.
|
||||
|
||||
* The documentation incorrectly said that C(opy) and R(ename) are the
|
||||
only ones that can be followed by the score number in the output in
|
||||
the --raw format.
|
||||
|
||||
* Fix a misspelled conditional that is always true.
|
||||
|
||||
* Code to read branch name from various files in .git/ directory
|
||||
would have misbehaved if the code to write them left an empty file.
|
||||
|
||||
* The "git push" documentation made the "--repo=<there>" option
|
||||
easily misunderstood.
|
||||
|
||||
* After attempting and failing a password-less authentication
|
||||
(e.g. kerberos), libcURL refuses to fall back to password based
|
||||
Basic authentication without a bit of help/encouragement.
|
||||
|
||||
* Setting diff.submodule to 'log' made "git format-patch" produce
|
||||
broken patches.
|
||||
|
||||
* "git rerere" (invoked internally from many mergy operations) did
|
||||
not correctly signal errors when told to update the working tree
|
||||
files and failed to do so for whatever reason.
|
||||
|
||||
* "git blame HEAD -- missing" failed to correctly say "HEAD" when it
|
||||
tried to say "No such path 'missing' in HEAD".
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
79
Documentation/RelNotes/2.3.2.txt
Normal file
79
Documentation/RelNotes/2.3.2.txt
Normal file
@ -0,0 +1,79 @@
|
||||
Git v2.3.2 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3.1
|
||||
------------------
|
||||
|
||||
* "update-index --refresh" used to leak when an entry cannot be
|
||||
refreshed for whatever reason.
|
||||
|
||||
* "git fast-import" used to crash when it could not close and
|
||||
conclude the resulting packfile cleanly.
|
||||
|
||||
* "git blame" died, trying to free an uninitialized piece of memory.
|
||||
|
||||
* "git merge-file" did not work correctly in a subdirectory.
|
||||
|
||||
* "git submodule add" failed to squash "path/to/././submodule" to
|
||||
"path/to/submodule".
|
||||
|
||||
* In v2.2.0, we broke "git prune" that runs in a repository that
|
||||
borrows from an alternate object store.
|
||||
|
||||
* Certain older vintages of cURL give irregular output from
|
||||
"curl-config --vernum", which confused our build system.
|
||||
|
||||
* An earlier workaround to squelch unhelpful deprecation warnings
|
||||
from the compiler on Mac OSX unnecessarily set minimum required
|
||||
version of the OS, which the user might want to raise (or lower)
|
||||
for other reasons.
|
||||
|
||||
* Longstanding configuration variable naming rules has been added to
|
||||
the documentation.
|
||||
|
||||
* The credential helper for Windows (in contrib/) used to mishandle
|
||||
a user name with an at-sign in it.
|
||||
|
||||
* Older GnuPG implementations may not correctly import the keyring
|
||||
material we prepare for the tests to use.
|
||||
|
||||
* Clarify in the documentation that "remote.<nick>.pushURL" and
|
||||
"remote.<nick>.URL" are there to name the same repository accessed
|
||||
via different transports, not two separate repositories.
|
||||
|
||||
* The pack bitmap support did not build with older versions of GCC.
|
||||
|
||||
* Reading configuration from a blob object, when it ends with a lone
|
||||
CR, use to confuse the configuration parser.
|
||||
|
||||
* We didn't format an integer that wouldn't fit in "int" but in
|
||||
"uintmax_t" correctly.
|
||||
|
||||
* "git push --signed" gave an incorrectly worded error message when
|
||||
the other side did not support the capability.
|
||||
|
||||
* "git fetch" over a remote-helper that cannot respond to "list"
|
||||
command could not fetch from a symbolic reference e.g. HEAD.
|
||||
|
||||
* The insn sheet "git rebase -i" creates did not fully honor
|
||||
core.abbrev settings.
|
||||
|
||||
* The tests that wanted to see that file becomes unreadable after
|
||||
running "chmod a-r file", and the tests that wanted to make sure it
|
||||
is not run as root, we used "can we write into the / directory?" as
|
||||
a cheap substitute, but on some platforms that is not a good
|
||||
heuristics. The tests and their prerequisites have been updated to
|
||||
check what they really require.
|
||||
|
||||
* The configuration variable 'mailinfo.scissors' was hard to
|
||||
discover in the documentation.
|
||||
|
||||
* Correct a breakage to git-svn around v2.2 era that triggers
|
||||
premature closing of FileHandle.
|
||||
|
||||
* Even though we officially haven't dropped Perl 5.8 support, the
|
||||
Getopt::Long package that came with it does not support "--no-"
|
||||
prefix to negate a boolean option; manually add support to help
|
||||
people with older Getopt::Long package.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
39
Documentation/RelNotes/2.3.3.txt
Normal file
39
Documentation/RelNotes/2.3.3.txt
Normal file
@ -0,0 +1,39 @@
|
||||
Git v2.3.3 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3.2
|
||||
------------------
|
||||
|
||||
* A corrupt input to "git diff -M" used cause us to segfault.
|
||||
|
||||
* The borrowed code in kwset API did not follow our usual convention
|
||||
to use "unsigned char" to store values that range from 0-255.
|
||||
|
||||
* Description given by "grep -h" for its --exclude-standard option
|
||||
was phrased poorly.
|
||||
|
||||
* Documentaton for "git remote add" mentioned "--tags" and
|
||||
"--no-tags" and it was not clear that fetch from the remote in
|
||||
the future will use the default behaviour when neither is given
|
||||
to override it.
|
||||
|
||||
* "git diff --shortstat --dirstat=changes" showed a dirstat based on
|
||||
lines that was never asked by the end user in addition to the
|
||||
dirstat that the user asked for.
|
||||
|
||||
* The interaction between "git submodule update" and the
|
||||
submodule.*.update configuration was not clearly documented.
|
||||
|
||||
* "git apply" was not very careful about reading from, removing,
|
||||
updating and creating paths outside the working tree (under
|
||||
--index/--cached) or the current directory (when used as a
|
||||
replacement for GNU patch).
|
||||
|
||||
* "git daemon" looked up the hostname even when "%CH" and "%IP"
|
||||
interpolations are not requested, which was unnecessary.
|
||||
|
||||
* The "interpolated-path" option of "git daemon" inserted any string
|
||||
client declared on the "host=" capability request without checking.
|
||||
Sanitize and limit %H and %CH to a saner and a valid DNS name.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
32
Documentation/RelNotes/2.3.4.txt
Normal file
32
Documentation/RelNotes/2.3.4.txt
Normal file
@ -0,0 +1,32 @@
|
||||
Git v2.3.4 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3.3
|
||||
------------------
|
||||
|
||||
* The 'color.status.unmerged' configuration was not described.
|
||||
|
||||
* "git log --decorate" did not reset colors correctly around the
|
||||
branch names.
|
||||
|
||||
* "git -C '' subcmd" refused to work in the current directory, unlike
|
||||
"cd ''" which silently behaves as a no-op.
|
||||
|
||||
* "git imap-send" learned to optionally talk with an IMAP server via
|
||||
libcURL; because there is no other option when Git is built with
|
||||
NO_OPENSSL option, use that codepath by default under such
|
||||
configuration.
|
||||
|
||||
* A workaround for certain build of GPG that triggered false breakage
|
||||
in a test has been added.
|
||||
|
||||
* "git rebase -i" recently started to include the number of
|
||||
commits in the insn sheet to be processed, but on a platform
|
||||
that prepends leading whitespaces to "wc -l" output, the numbers
|
||||
are shown with extra whitespaces that aren't necessary.
|
||||
|
||||
* We did not parse username followed by literal IPv6 address in SSH
|
||||
transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git
|
||||
correctly.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
44
Documentation/RelNotes/2.3.5.txt
Normal file
44
Documentation/RelNotes/2.3.5.txt
Normal file
@ -0,0 +1,44 @@
|
||||
Git v2.3.5 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3.4
|
||||
------------------
|
||||
|
||||
* The prompt script (in contrib/) did not show the untracked sign
|
||||
when working in a subdirectory without any untracked files.
|
||||
|
||||
* Even though "git grep --quiet" is run merely to ask for the exit
|
||||
status, we spawned the pager regardless. Stop doing that.
|
||||
|
||||
* Recommend format-patch and send-email for those who want to submit
|
||||
patches to this project.
|
||||
|
||||
* An failure early in the "git clone" that started creating the
|
||||
working tree and repository could have resulted in some directories
|
||||
and files left without getting cleaned up.
|
||||
|
||||
* "git fetch" that fetches a commit using the allow-tip-sha1-in-want
|
||||
extension could have failed to fetch all the requested refs.
|
||||
|
||||
* The split-index mode introduced at v2.3.0-rc0~41 was broken in the
|
||||
codepath to protect us against a broken reimplementation of Git
|
||||
that writes an invalid index with duplicated index entries, etc.
|
||||
|
||||
* "git prune" used to largely ignore broken refs when deciding which
|
||||
objects are still being used, which could spread an existing small
|
||||
damage and make it a larger one.
|
||||
|
||||
* "git tag -h" used to show the "--column" and "--sort" options
|
||||
that are about listing in a wrong section.
|
||||
|
||||
* The transfer.hiderefs support did not quite work for smart-http
|
||||
transport.
|
||||
|
||||
* The code that reads from the ctags file in the completion script
|
||||
(in contrib/) did not spell ${param/pattern/string} substitution
|
||||
correctly, which happened to work with bash but not with zsh.
|
||||
|
||||
* The explanation on "rebase --preserve-merges", "pull --rebase=preserve",
|
||||
and "push --force-with-lease" in the documentation was unclear.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code clean-ups.
|
13
Documentation/RelNotes/2.3.6.txt
Normal file
13
Documentation/RelNotes/2.3.6.txt
Normal file
@ -0,0 +1,13 @@
|
||||
Git v2.3.6 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3.5
|
||||
------------------
|
||||
|
||||
* "diff-highlight" (in contrib/) used to show byte-by-byte
|
||||
differences, which meant that multi-byte characters can be chopped
|
||||
in the middle. It learned to pay attention to character boundaries
|
||||
(assuming the UTF-8 payload).
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
21
Documentation/RelNotes/2.3.7.txt
Normal file
21
Documentation/RelNotes/2.3.7.txt
Normal file
@ -0,0 +1,21 @@
|
||||
Git v2.3.7 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3.6
|
||||
------------------
|
||||
|
||||
* An earlier update to the parser that disects a URL broke an
|
||||
address, followed by a colon, followed by an empty string (instead
|
||||
of the port number), e.g. ssh://example.com:/path/to/repo.
|
||||
|
||||
* The completion script (in contrib/) contaminated global namespace
|
||||
and clobbered on a shell variable $x.
|
||||
|
||||
* The "git push --signed" protocol extension did not limit what the
|
||||
"nonce" that is a server-chosen string can contain or how long it
|
||||
can be, which was unnecessarily lax. Limit both the length and the
|
||||
alphabet to a reasonably small space that can still have enough
|
||||
entropy.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
22
Documentation/RelNotes/2.3.8.txt
Normal file
22
Documentation/RelNotes/2.3.8.txt
Normal file
@ -0,0 +1,22 @@
|
||||
Git v2.3.8 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3.7
|
||||
------------------
|
||||
|
||||
* The usual "git diff" when seeing a file turning into a directory
|
||||
showed a patchset to remove the file and create all files in the
|
||||
directory, but "git diff --no-index" simply refused to work. Also,
|
||||
when asked to compare a file and a directory, imitate POSIX "diff"
|
||||
and compare the file with the file with the same name in the
|
||||
directory, instead of refusing to run.
|
||||
|
||||
* The default $HOME/.gitconfig file created upon "git config --global"
|
||||
that edits it had incorrectly spelled user.name and user.email
|
||||
entries in it.
|
||||
|
||||
* "git commit --date=now" or anything that relies on approxidate lost
|
||||
the daylight-saving-time offset.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
9
Documentation/RelNotes/2.3.9.txt
Normal file
9
Documentation/RelNotes/2.3.9.txt
Normal file
@ -0,0 +1,9 @@
|
||||
Git v2.3.9 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.3.8
|
||||
------------------
|
||||
|
||||
* A handful of codepaths that used to use fixed-sized arrays to hold
|
||||
pathnames have been corrected to use strbuf and other mechanisms to
|
||||
allow longer pathnames without fearing overflows.
|
514
Documentation/RelNotes/2.4.0.txt
Normal file
514
Documentation/RelNotes/2.4.0.txt
Normal file
@ -0,0 +1,514 @@
|
||||
Git 2.4 Release Notes
|
||||
=====================
|
||||
|
||||
Backward compatibility warning(s)
|
||||
---------------------------------
|
||||
|
||||
This release has a few changes in the user-visible output from
|
||||
Porcelain commands. These are not meant to be parsed by scripts, but
|
||||
users still may want to be aware of the changes:
|
||||
|
||||
* The output from "git log --decorate" (and, more generally, the "%d"
|
||||
format specifier used in the "--format=<string>" parameter to the
|
||||
"git log" family of commands) has changed. It used to list "HEAD"
|
||||
just like other branches; e.g.,
|
||||
|
||||
$ git log --decorate -1 master
|
||||
commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, master)
|
||||
...
|
||||
|
||||
This release changes the output slightly when HEAD refers to a
|
||||
branch whose name is also shown in the output. The above is now
|
||||
shown as:
|
||||
|
||||
$ git log --decorate -1 master
|
||||
commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> master)
|
||||
...
|
||||
|
||||
* The phrasing "git branch" uses to describe a detached HEAD has been
|
||||
updated to agree with the phrasing used by "git status":
|
||||
|
||||
- When HEAD is at the same commit as when it was originally
|
||||
detached, they now both show "detached at <commit object name>".
|
||||
|
||||
- When HEAD has moved since it was originally detached, they now
|
||||
both show "detached from <commit object name>".
|
||||
|
||||
Previously, "git branch" always used "from".
|
||||
|
||||
|
||||
Updates since v2.3
|
||||
------------------
|
||||
|
||||
Ports
|
||||
|
||||
* Our default I/O size (8 MiB) for large files was too large for some
|
||||
platforms with smaller SSIZE_MAX, leading to read(2)/write(2)
|
||||
failures.
|
||||
|
||||
* We did not check the curl library version before using the
|
||||
CURLOPT_PROXYAUTH feature, which did not exist in older versions of
|
||||
the library.
|
||||
|
||||
* We now detect number of CPUs on older BSD-derived systems.
|
||||
|
||||
* Portability fixes and workarounds for shell scripts have been added
|
||||
to help BSD-derived systems.
|
||||
|
||||
|
||||
UI, Workflows & Features
|
||||
|
||||
* The command usage info strings given by "git cmd -h" and in
|
||||
documentation have been tweaked for consistency.
|
||||
|
||||
* The "sync" subcommand of "git p4" now allows users to exclude
|
||||
subdirectories like its "clone" subcommand does.
|
||||
|
||||
* "git log --invert-grep --grep=WIP" will show only commits that do
|
||||
not have the string "WIP" in their messages.
|
||||
|
||||
* "git push" has been taught an "--atomic" option that makes a push
|
||||
that updates more than one ref an "all-or-none" affair.
|
||||
|
||||
* Extending the "push to deploy" feature that was added in 2.3, the
|
||||
behaviour of "git push" when updating the branch that is checked
|
||||
out can now be tweaked by a "push-to-checkout" hook.
|
||||
|
||||
* HTTP-based transports now send Accept-Language when making
|
||||
requests. The languages to accept are inferred from environment
|
||||
variables on the client side (LANGUAGE, etc).
|
||||
|
||||
* "git send-email" used to accept a mistaken "y" (or "yes") as an
|
||||
answer to "What encoding do you want to use [UTF-8]?" without
|
||||
questioning. Now it asks for confirmation when the answer looks too
|
||||
short to be a valid encoding name.
|
||||
|
||||
* When "git apply --whitespace=fix" fixed whitespace errors in the
|
||||
common context lines, the command reports that it did so.
|
||||
|
||||
* "git status" now allows the "-v" option to be given twice, in which
|
||||
case it also shows the differences in the working tree that are not
|
||||
staged to be committed.
|
||||
|
||||
* "git cherry-pick" used to clean up the log message even when it is
|
||||
merely replaying an existing commit. It now replays the message
|
||||
verbatim unless you are editing the message of the resulting
|
||||
commit.
|
||||
|
||||
* "git archive" can now be told to set the 'text' attribute in the
|
||||
resulting zip archive.
|
||||
|
||||
* Output from "git log --decorate" now distinguishes between a
|
||||
detached HEAD vs. a HEAD that points at a branch.
|
||||
|
||||
This is a potentially backward-incompatible change; see above for
|
||||
more information.
|
||||
|
||||
* When HEAD was detached when at commit xyz and hasn't been moved
|
||||
since it was detached, "git status" would report "detached at xyz"
|
||||
whereas "git branch" would report "detached from xyz". Now the
|
||||
output of "git branch" agrees with that of "git status".
|
||||
|
||||
This is a potentially backward-incompatible change; see above for
|
||||
more information.
|
||||
|
||||
* "git -C '' subcmd" now works in the current directory (analogously
|
||||
to "cd ''") rather than dying with an error message.
|
||||
(merge 6a536e2 kn/git-cd-to-empty later to maint).
|
||||
|
||||
* The versionsort.prereleaseSuffix configuration variable can be used
|
||||
to specify that, for example, v1.0-pre1 comes before v1.0.
|
||||
|
||||
* A new "push.followTags" configuration turns the "--follow-tags"
|
||||
option on by default for the "git push" command.
|
||||
|
||||
* "git log --graph --no-walk A B..." is a nonsensical combination of
|
||||
options: "--no-walk" requests discrete points in the history, while
|
||||
"--graph" asks to draw connections between these discrete points.
|
||||
Forbid the use of these options together.
|
||||
|
||||
* "git rev-list --bisect --first-parent" does not work (yet) and can
|
||||
even cause SEGV; forbid it. "git log --bisect --first-parent" would
|
||||
not be useful until "git bisect --first-parent" materializes, so
|
||||
also forbid it for now.
|
||||
|
||||
|
||||
Performance, Internal Implementation, Development Support etc.
|
||||
|
||||
* Slightly change the implementation of the N_() macro to help us
|
||||
detect mistakes.
|
||||
|
||||
* Restructure the implementation of "reflog expire" to fit better
|
||||
with the recently updated reference API.
|
||||
|
||||
* The transport-helper did not pass transport options such as
|
||||
verbosity, progress, cloning, etc. to import and export based
|
||||
helpers, like it did for fetch and push based helpers, robbing them
|
||||
of the chance to honor the wish of the end-users better.
|
||||
|
||||
* The tests that wanted to see that a file becomes unreadable after
|
||||
running "chmod a-r file", and the tests that wanted to make sure
|
||||
that they are not run as root, used "can we write into the /
|
||||
directory?" as a cheap substitute. But on some platforms that is
|
||||
not a good heuristic. The tests and their prerequisites have been
|
||||
updated to check what they really require.
|
||||
(merge f400e51 jk/sanity later to maint).
|
||||
|
||||
* Various issues around "reflog expire", e.g. using --updateref when
|
||||
expiring a reflog for a symbolic reference, have been corrected
|
||||
and/or made saner.
|
||||
|
||||
* The documentation for the strbuf API had been split between the API
|
||||
documentation and the header file. Consolidate the documentation in
|
||||
strbuf.h.
|
||||
|
||||
* The error handling functions and conventions are now documented in
|
||||
the API manual (in api-error-handling.txt).
|
||||
|
||||
* Optimize gitattribute look-up, mostly useful in "git grep" on a
|
||||
project that does not use many attributes, by avoiding it when we
|
||||
(should) know that the attributes are not defined in the first
|
||||
place.
|
||||
|
||||
* Typofix in comments.
|
||||
(merge ef2956a ak/git-pm-typofix later to maint).
|
||||
|
||||
* Code clean-up.
|
||||
(merge 0b868f0 sb/hex-object-name-is-at-most-41-bytes-long later to maint).
|
||||
(merge 5d30851 dp/remove-duplicated-header-inclusion later to maint).
|
||||
|
||||
* Simplify the ref transaction API for verifying that "the ref should
|
||||
be pointing at this object".
|
||||
|
||||
* Simplify the code in "git daemon" that parses out and holds
|
||||
hostnames used in request interpolation.
|
||||
|
||||
* Restructure the "git push" codepath to make it easier to add new
|
||||
configuration bits.
|
||||
|
||||
* The run-command interface made it easy to make a pipe for us to
|
||||
read from a process, wait for the process to finish, and then
|
||||
attempt to read its output. But this pattern can lead to deadlock.
|
||||
So introduce a helper to do this correctly (i.e., first read, and
|
||||
then wait the process to finish) and also add code to prevent such
|
||||
abuse in the run-command helper.
|
||||
|
||||
* People often forget to chain the commands in their test together
|
||||
with &&, letting a failure from an earlier command in the test go
|
||||
unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to
|
||||
catch such a mistake more easily.
|
||||
|
||||
|
||||
Also contains various documentation updates and code clean-ups.
|
||||
|
||||
|
||||
Fixes since v2.3
|
||||
----------------
|
||||
|
||||
Unless otherwise noted, all the fixes since v2.3 in the maintenance
|
||||
track are contained in this release (see the maintenance releases'
|
||||
notes for details).
|
||||
|
||||
* "git blame HEAD -- missing" failed to correctly say "HEAD" when it
|
||||
tried to say "No such path 'missing' in HEAD".
|
||||
(merge a46442f jk/blame-commit-label later to maint).
|
||||
|
||||
* "git rerere" (invoked internally from many mergy operations) did
|
||||
not correctly signal errors when it attempted to update the working
|
||||
tree files but failed for whatever reason.
|
||||
(merge 89ea903 jn/rerere-fail-on-auto-update-failure later to maint).
|
||||
|
||||
* Setting diff.submodule to 'log' made "git format-patch" produce
|
||||
broken patches.
|
||||
(merge 339de50 dk/format-patch-ignore-diff-submodule later to maint).
|
||||
|
||||
* After attempting and failing a password-less authentication (e.g.,
|
||||
Kerberos), libcURL refuses to fall back to password-based Basic
|
||||
authentication without a bit of help/encouragement.
|
||||
(merge 4dbe664 bc/http-fallback-to-password-after-krb-fails later to maint).
|
||||
|
||||
* The "git push" documentation for the "--repo=<there>" option was
|
||||
easily misunderstood.
|
||||
(merge 57b92a7 mg/push-repo-option-doc later to maint).
|
||||
|
||||
* Code to read a branch name from various files in the .git/
|
||||
directory would have overrun array limits if asked to read an empty
|
||||
file.
|
||||
(merge 66ec904 jk/status-read-branch-name-fix later to maint).
|
||||
|
||||
* Remove a superfluous conditional that is always true.
|
||||
(merge 94ee8e2 jk/remote-curl-an-array-in-struct-cannot-be-null later to maint).
|
||||
|
||||
* The "git diff --raw" documentation incorrectly implied that C(opy)
|
||||
and R(ename) are the only statuses that can be followed by a score
|
||||
number.
|
||||
(merge ac1c2d9 jc/diff-format-doc later to maint).
|
||||
|
||||
* A broken pack .idx file in the receiving repository prevented the
|
||||
dumb http transport from fetching a good copy of it from the other
|
||||
side.
|
||||
(merge 8b9c2dd jk/dumb-http-idx-fetch-fix later to maint).
|
||||
|
||||
* The error message from "git commit", when a non-existing author
|
||||
name was given as value to the "--author=" parameter, has been
|
||||
reworded to avoid misunderstanding.
|
||||
(merge 1044b1f mg/commit-author-no-match-malformed-message later to maint).
|
||||
|
||||
* "git log --help" used to show rev-list options that are irrelevant
|
||||
to the "log" command.
|
||||
(merge 3cab02d jc/doc-log-rev-list-options later to maint).
|
||||
|
||||
* "git apply --whitespace=fix" used to under-allocate memory when the
|
||||
fix resulted in a longer text than the original patch.
|
||||
(merge 407a792 jc/apply-ws-fix-expands later to maint).
|
||||
|
||||
* The interactive "show a list and let the user choose from it"
|
||||
interface used by "git add -i" unnecessarily prompted the user even
|
||||
when the candidate list was empty, against which the only "choice"
|
||||
the user could have made was to choose nothing.
|
||||
(merge a9c4641 ak/add-i-empty-candidates later to maint).
|
||||
|
||||
* The todo list created by "git rebase -i" did not fully honor
|
||||
core.abbrev settings.
|
||||
(merge edb72d5 ks/rebase-i-abbrev later to maint).
|
||||
|
||||
* "git fetch" over a remote-helper that cannot respond to the "list"
|
||||
command could not fetch from a symbolic reference (e.g., HEAD).
|
||||
(merge 33cae54 mh/deref-symref-over-helper-transport later to maint).
|
||||
|
||||
* "git push --signed" gave an incorrectly worded error message when
|
||||
the other side did not support the capability.
|
||||
|
||||
* The "git push --signed" protocol extension did not limit what the
|
||||
"nonce" (a server-chosen string) could contain nor how long it
|
||||
could be, which was unnecessarily lax. Limit both the length and
|
||||
the alphabet to a reasonably small space that can still have enough
|
||||
entropy.
|
||||
(merge afcb6ee jc/push-cert later to maint).
|
||||
|
||||
* The completion script (in contrib/) clobbered the shell variable $x
|
||||
in the global shell namespace.
|
||||
(merge 852ff1c ma/bash-completion-leaking-x later to maint).
|
||||
|
||||
* We incorrectly formatted a "uintmax_t" integer that doesn't fit in
|
||||
"int".
|
||||
(merge d306f3d jk/decimal-width-for-uintmax later to maint).
|
||||
|
||||
* The configuration parser used to be confused when reading
|
||||
configuration from a blob object that ends with a lone CR.
|
||||
(merge 1d0655c jk/config-no-ungetc-eof later to maint).
|
||||
|
||||
* The pack bitmap support did not build with older versions of GCC.
|
||||
(merge bd4e882 jk/pack-bitmap later to maint).
|
||||
|
||||
* The documentation wasn't clear that "remote.<nick>.pushURL" and
|
||||
"remote.<nick>.URL" are there to name the same repository accessed
|
||||
via different transports, not two separate repositories.
|
||||
(merge 697f652 jc/remote-set-url-doc later to maint).
|
||||
|
||||
* Older GnuPG implementations may not correctly import the keyring
|
||||
material we prepare for the tests to use.
|
||||
(merge 1f985d6 ch/new-gpg-drops-rfc-1991 later to maint).
|
||||
|
||||
* The credential helper for Windows (in contrib/) used to mishandle
|
||||
user names that contain an at-sign.
|
||||
(merge 13d261e av/wincred-with-at-in-username-fix later to maint).
|
||||
|
||||
* "diff-highlight" (in contrib/) used to show byte-by-byte
|
||||
differences, which could cause multi-byte characters to be chopped
|
||||
in the middle. It learned to pay attention to character boundaries
|
||||
(assuming UTF-8).
|
||||
(merge 8d00662 jk/colors later to maint).
|
||||
|
||||
* Document longstanding configuration variable naming rules in
|
||||
CodingGuidelines.
|
||||
(merge 35840a3 jc/conf-var-doc later to maint).
|
||||
|
||||
* An earlier workaround to squelch unhelpful deprecation warnings
|
||||
from the compiler on OS X unnecessarily set a minimum required
|
||||
version of the OS, which the user might want to raise (or lower)
|
||||
for other reasons.
|
||||
(merge 88c03eb es/squelch-openssl-warnings-on-macosx later to maint).
|
||||
|
||||
* Certain older vintages of cURL give irregular output from
|
||||
"curl-config --vernum", which confused our build system.
|
||||
(merge 3af6792 tc/curl-vernum-output-broken-in-7.11 later to maint).
|
||||
|
||||
* In v2.2.0, we broke "git prune" that runs in a repository that
|
||||
borrows from an alternate object store.
|
||||
(merge b0a4264 jk/prune-mtime later to maint).
|
||||
|
||||
* "git submodule add" failed to squash "path/to/././submodule" to
|
||||
"path/to/submodule".
|
||||
(merge 8196e72 ps/submodule-sanitize-path-upon-add later to maint).
|
||||
|
||||
* "git merge-file" did not work correctly when invoked in a
|
||||
subdirectory.
|
||||
(merge 204a8ff ab/merge-file-prefix later to maint).
|
||||
|
||||
* "git blame" could die trying to free an uninitialized piece of
|
||||
memory.
|
||||
(merge e600592 es/blame-commit-info-fix later to maint).
|
||||
|
||||
* "git fast-import" used to crash when it could not close and
|
||||
finalize the resulting packfile cleanly.
|
||||
(merge 5e915f3 jk/fast-import-die-nicely-fix later to maint).
|
||||
|
||||
* "update-index --refresh" used to leak memory when an entry could
|
||||
not be refreshed for whatever reason.
|
||||
(merge bc1c2ca sb/plug-leak-in-make-cache-entry later to maint).
|
||||
|
||||
* The "interpolated-path" option of "git daemon" inserted any string
|
||||
the client declared on the "host=" capability request without
|
||||
checking. Sanitize and limit %H and %CH to a saner and a valid DNS
|
||||
name.
|
||||
(merge b485373 jk/daemon-interpolate later to maint).
|
||||
|
||||
* "git daemon" unnecessarily looked up the hostname even when "%CH"
|
||||
and "%IP" interpolations were not requested.
|
||||
(merge dc8edc8 rs/daemon-interpolate later to maint).
|
||||
|
||||
* We relied on "--no-" prefix handling in Perl's Getopt::Long
|
||||
package, even though that support didn't exist in Perl 5.8 (which
|
||||
we still support). Manually add support to help people with older
|
||||
Getopt::Long packages.
|
||||
(merge f471494 km/send-email-getopt-long-workarounds later to maint).
|
||||
|
||||
* "git apply" was not very careful about reading from, removing,
|
||||
updating and creating paths outside the working tree (under
|
||||
--index/--cached) or the current directory (when used as a
|
||||
replacement for GNU patch).
|
||||
(merge e0d201b jc/apply-beyond-symlink later to maint).
|
||||
|
||||
* Correct a breakage in git-svn, introduced around the v2.2 era, that
|
||||
can cause FileHandles to be closed prematurely.
|
||||
(merge e426311 ew/svn-maint-fixes later to maint).
|
||||
|
||||
* We did not parse usernames followed by literal IPv6 addresses
|
||||
correctly in SSH transport URLs; e.g.,
|
||||
ssh://user@[2001:db8::1]:22/repo.git.
|
||||
(merge 6b6c5f7 tb/connect-ipv6-parse-fix later to maint).
|
||||
|
||||
* The configuration variable 'mailinfo.scissors' was hard to
|
||||
discover in the documentation.
|
||||
(merge afb5de7 mm/am-c-doc later to maint).
|
||||
|
||||
* The interaction between "git submodule update" and the
|
||||
submodule.*.update configuration was not clearly documented.
|
||||
(merge 5c31acf ms/submodule-update-config-doc later to maint).
|
||||
|
||||
* "git diff --shortstat" used together with "--dirstat=changes" or
|
||||
"--dirstat=files" incorrectly output dirstat information twice.
|
||||
(merge ab27389 mk/diff-shortstat-dirstat-fix later to maint).
|
||||
|
||||
* The manpage for "git remote add" mentioned "--tags" and "--no-tags"
|
||||
but did not explain what happens if neither option is provided.
|
||||
(merge aaba0ab mg/doc-remote-tags-or-not later to maint).
|
||||
|
||||
* The description of "--exclude-standard option" in the output of
|
||||
"git grep -h" was phrased poorly.
|
||||
(merge 77fdb8a nd/grep-exclude-standard-help-fix later to maint).
|
||||
|
||||
* "git rebase -i" recently started to include the number of commits
|
||||
in the todo list, but that output included extraneous whitespace on
|
||||
a platform that prepends leading whitespaces to its "wc -l" output.
|
||||
(merge 2185d3b es/rebase-i-count-todo later to maint).
|
||||
|
||||
* The borrowed code in the kwset API did not follow our usual
|
||||
convention to use "unsigned char" to store values that range from
|
||||
0-255.
|
||||
(merge 189c860 bw/kwset-use-unsigned later to maint).
|
||||
|
||||
* A corrupt input to "git diff -M" used to cause it to segfault.
|
||||
(merge 4d6be03 jk/diffcore-rename-duplicate later to maint).
|
||||
|
||||
* Certain builds of GPG triggered false breakages in a test.
|
||||
(merge 3f88c1b mg/verify-commit later to maint).
|
||||
|
||||
* "git imap-send" learned to optionally talk with an IMAP server via
|
||||
libcURL. Because there is no other option when Git is built with
|
||||
the NO_OPENSSL option, use libcURL by default in that case.
|
||||
(merge dcd01ea km/imap-send-libcurl-options later to maint).
|
||||
|
||||
* "git log --decorate" did not reset colors correctly around the
|
||||
branch names.
|
||||
(merge 5ee8758 jc/decorate-leaky-separator-color later to maint).
|
||||
|
||||
* The code that reads from the ctags file in the completion script
|
||||
(in contrib/) did not spell ${param/pattern/string} substitution
|
||||
correctly, which happened to work with bash but not with zsh.
|
||||
(merge db8d750 js/completion-ctags-pattern-substitution-fix later to maint).
|
||||
|
||||
* The transfer.hiderefs support did not quite work for smart-http
|
||||
transport.
|
||||
(merge 8ddf3ca jk/smart-http-hide-refs later to maint).
|
||||
|
||||
* In the "git tag -h" output, move the documentation for the
|
||||
"--column" and "--sort" options to the "Tag listing options"
|
||||
section.
|
||||
(merge dd059c6 jk/tag-h-column-is-a-listing-option later to maint).
|
||||
|
||||
* "git prune" used to largely ignore broken refs when deciding which
|
||||
objects are still being used, which could cause reference
|
||||
corruption to lead to object loss.
|
||||
(merge ea56c4e jk/prune-with-corrupt-refs later to maint).
|
||||
|
||||
* The split-index mode introduced in v2.3.0-rc0~41 was broken in the
|
||||
codepath to protect us against a broken reimplementation of Git
|
||||
that writes an invalid index with duplicated index entries, etc.
|
||||
(merge 03f15a7 tg/fix-check-order-with-split-index later to maint).
|
||||
|
||||
* "git fetch", when fetching a commit using the
|
||||
allow-tip-sha1-in-want extension, could have failed to fetch all of
|
||||
the requested refs.
|
||||
(merge 32d0462 jk/fetch-pack later to maint).
|
||||
|
||||
* An failure early in the "git clone" that started creating the
|
||||
working tree and repository could have resulted in the failure to
|
||||
clean up some directories and files.
|
||||
(merge 16eff6c jk/cleanup-failed-clone later to maint).
|
||||
|
||||
* Recommend format-patch and send-email for those who want to submit
|
||||
patches to this project.
|
||||
(merge b25c469 jc/submitting-patches-mention-send-email later to maint).
|
||||
|
||||
* Do not spawn the pager when "git grep" is run with "--quiet".
|
||||
(merge c2048f0 ws/grep-quiet-no-pager later to maint).
|
||||
|
||||
* The prompt script (in contrib/) did not show the untracked sign
|
||||
when working in a subdirectory without any untracked files.
|
||||
(merge 9bdc517 ct/prompt-untracked-fix later to maint).
|
||||
|
||||
* An earlier update to the URL parser broke an address that contains
|
||||
a colon but an empty string for the port number, like
|
||||
ssh://example.com:/path/to/repo.
|
||||
(merge 6b6c5f7 tb/connect-ipv6-parse-fix later to maint).
|
||||
|
||||
* Code cleanups and documentation updates.
|
||||
(merge 2ce63e9 rs/simple-cleanups later to maint).
|
||||
(merge 33baa69 rj/no-xopen-source-for-cygwin later to maint).
|
||||
(merge 817d03e jc/diff-test-updates later to maint).
|
||||
(merge eb32c66 ak/t5516-typofix later to maint).
|
||||
(merge bcd57cb mr/doc-clean-f-f later to maint).
|
||||
(merge 0d6accc mg/doc-status-color-slot later to maint).
|
||||
(merge 53e53c7 sg/completion-remote later to maint).
|
||||
(merge 8fa7975 ak/git-done-help-cleanup later to maint).
|
||||
(merge 9a6f128 rs/deflate-init-cleanup later to maint).
|
||||
(merge 6f75d45 rs/use-isxdigit later to maint).
|
||||
(merge 376e4b3 jk/test-annoyances later to maint).
|
||||
(merge 7032054 nd/doc-git-index-version later to maint).
|
||||
(merge e869c5e tg/test-index-v4 later to maint).
|
||||
(merge 599d223 jk/simplify-csum-file-sha1fd-check later to maint).
|
||||
(merge 260d585 sg/completion-gitcomp-nl-for-refs later to maint).
|
||||
(merge 777c55a jc/report-path-error-to-dir later to maint).
|
||||
(merge fddfaf8 ph/push-doc-cas later to maint).
|
||||
(merge d50d31e ss/pull-rebase-preserve later to maint).
|
||||
(merge c8c3f1d pt/enter-repo-comment-fix later to maint).
|
||||
(merge d7bfb9e jz/gitweb-conf-doc-fix later to maint).
|
||||
(merge f907282 jk/cherry-pick-docfix later to maint).
|
||||
(merge d3c0811 iu/fix-parse-options-h-comment later to maint).
|
||||
(merge 6c3b2af jg/cguide-we-cannot-count later to maint).
|
||||
(merge 2b8bd44 jk/pack-corruption-post-mortem later to maint).
|
||||
(merge 9585cb8 jn/doc-fast-import-no-16-octopus-limit later to maint).
|
||||
(merge 5dcd1b1 ps/grep-help-all-callback-arg later to maint).
|
||||
(merge f1f4c84 va/fix-git-p4-tests later to maint).
|
40
Documentation/RelNotes/2.4.1.txt
Normal file
40
Documentation/RelNotes/2.4.1.txt
Normal file
@ -0,0 +1,40 @@
|
||||
Git v2.4.1 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4
|
||||
----------------
|
||||
|
||||
* The usual "git diff" when seeing a file turning into a directory
|
||||
showed a patchset to remove the file and create all files in the
|
||||
directory, but "git diff --no-index" simply refused to work. Also,
|
||||
when asked to compare a file and a directory, imitate POSIX "diff"
|
||||
and compare the file with the file with the same name in the
|
||||
directory, instead of refusing to run.
|
||||
|
||||
* The default $HOME/.gitconfig file created upon "git config --global"
|
||||
that edits it had incorrectly spelled user.name and user.email
|
||||
entries in it.
|
||||
|
||||
* "git commit --date=now" or anything that relies on approxidate lost
|
||||
the daylight-saving-time offset.
|
||||
|
||||
* "git cat-file bl $blob" failed to barf even though there is no
|
||||
object type that is "bl".
|
||||
|
||||
* Teach the codepaths that read .gitignore and .gitattributes files
|
||||
that these files encoded in UTF-8 may have UTF-8 BOM marker at the
|
||||
beginning; this makes it in line with what we do for configuration
|
||||
files already.
|
||||
|
||||
* Access to objects in repositories that borrow from another one on a
|
||||
slow NFS server unnecessarily got more expensive due to recent code
|
||||
becoming more cautious in a naive way not to lose objects to pruning.
|
||||
|
||||
* We avoid setting core.worktree when the repository location is the
|
||||
".git" directory directly at the top level of the working tree, but
|
||||
the code misdetected the case in which the working tree is at the
|
||||
root level of the filesystem (which arguably is a silly thing to
|
||||
do, but still valid).
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
45
Documentation/RelNotes/2.4.2.txt
Normal file
45
Documentation/RelNotes/2.4.2.txt
Normal file
@ -0,0 +1,45 @@
|
||||
Git v2.4.2 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4.1
|
||||
------------------
|
||||
|
||||
* "git rev-list --objects $old --not --all" to see if everything that
|
||||
is reachable from $old is already connected to the existing refs
|
||||
was very inefficient.
|
||||
|
||||
* "hash-object --literally" introduced in v2.2 was not prepared to
|
||||
take a really long object type name.
|
||||
|
||||
* "git rebase --quiet" was not quite quiet when there is nothing to
|
||||
do.
|
||||
|
||||
* The completion for "log --decorate=" parameter value was incorrect.
|
||||
|
||||
* "filter-branch" corrupted commit log message that ends with an
|
||||
incomplete line on platforms with some "sed" implementations that
|
||||
munge such a line. Work it around by avoiding to use "sed".
|
||||
|
||||
* "git daemon" fails to build from the source under NO_IPV6
|
||||
configuration (regression in 2.4).
|
||||
|
||||
* "git stash pop/apply" forgot to make sure that not just the working
|
||||
tree is clean but also the index is clean. The latter is important
|
||||
as a stash application can conflict and the index will be used for
|
||||
conflict resolution.
|
||||
|
||||
* We have prepended $GIT_EXEC_PATH and the path "git" is installed in
|
||||
(typically "/usr/bin") to $PATH when invoking subprograms and hooks
|
||||
for almost eternity, but the original use case the latter tried to
|
||||
support was semi-bogus (i.e. install git to /opt/foo/git and run it
|
||||
without having /opt/foo on $PATH), and more importantly it has
|
||||
become less and less relevant as Git grew more mainstream (i.e. the
|
||||
users would _want_ to have it on their $PATH). Stop prepending the
|
||||
path in which "git" is installed to users' $PATH, as that would
|
||||
interfere the command search order people depend on (e.g. they may
|
||||
not like versions of programs that are unrelated to Git in /usr/bin
|
||||
and want to override them by having different ones in /usr/local/bin
|
||||
and have the latter directory earlier in their $PATH).
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
76
Documentation/RelNotes/2.4.3.txt
Normal file
76
Documentation/RelNotes/2.4.3.txt
Normal file
@ -0,0 +1,76 @@
|
||||
Git v2.4.3 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4.3
|
||||
------------------
|
||||
|
||||
* Error messages from "git branch" called remote-tracking branches as
|
||||
"remote branches".
|
||||
|
||||
* "git rerere forget" in a repository without rerere enabled gave a
|
||||
cryptic error message; it should be a silent no-op instead.
|
||||
|
||||
* "git pull --log" and "git pull --no-log" worked as expected, but
|
||||
"git pull --log=20" did not.
|
||||
|
||||
* The pull.ff configuration was supposed to override the merge.ff
|
||||
configuration, but it didn't.
|
||||
|
||||
* The code to read pack-bitmap wanted to allocate a few hundred
|
||||
pointers to a structure, but by mistake allocated and leaked memory
|
||||
enough to hold that many actual structures. Correct the allocation
|
||||
size and also have it on stack, as it is small enough.
|
||||
|
||||
* Various documentation mark-up fixes to make the output more
|
||||
consistent in general and also make AsciiDoctor (an alternative
|
||||
formatter) happier.
|
||||
|
||||
* "git bundle verify" did not diagnose extra parameters on the
|
||||
command line.
|
||||
|
||||
* Multi-ref transaction support we merged a few releases ago
|
||||
unnecessarily kept many file descriptors open, risking to fail with
|
||||
resource exhaustion.
|
||||
|
||||
* The ref API did not handle cases where 'refs/heads/xyzzy/frotz' is
|
||||
removed at the same time as 'refs/heads/xyzzy' is added (or vice
|
||||
versa) very well.
|
||||
|
||||
* The "log --decorate" enhancement in Git 2.4 that shows the commit
|
||||
at the tip of the current branch e.g. "HEAD -> master", did not
|
||||
work with --decorate=full.
|
||||
|
||||
* There was a commented-out (instead of being marked to expect
|
||||
failure) test that documented a breakage that was fixed since the
|
||||
test was written; turn it into a proper test.
|
||||
|
||||
* core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed
|
||||
to be overridden by repository-specific .git/info/exclude file, but
|
||||
the order was swapped from the beginning. This belatedly fixes it.
|
||||
|
||||
* The connection initiation code for "ssh" transport tried to absorb
|
||||
differences between the stock "ssh" and Putty-supplied "plink" and
|
||||
its derivatives, but the logic to tell that we are using "plink"
|
||||
variants were too loose and falsely triggered when "plink" appeared
|
||||
anywhere in the path (e.g. "/home/me/bin/uplink/ssh").
|
||||
|
||||
* "git rebase -i" moved the "current" command from "todo" to "done" a
|
||||
bit too prematurely, losing a step when a "pick" did not even start.
|
||||
|
||||
* "git add -e" did not allow the user to abort the operation by
|
||||
killing the editor.
|
||||
|
||||
* Git 2.4 broke setting verbosity and progress levels on "git clone"
|
||||
with native transports.
|
||||
|
||||
* Some time ago, "git blame" (incorrectly) lost the convert_to_git()
|
||||
call when synthesizing a fake "tip" commit that represents the
|
||||
state in the working tree, which broke folks who record the history
|
||||
with LF line ending to make their project portabile across
|
||||
platforms while terminating lines in their working tree files with
|
||||
CRLF for their platform.
|
||||
|
||||
* Code clean-up for xdg configuration path support.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
35
Documentation/RelNotes/2.4.4.txt
Normal file
35
Documentation/RelNotes/2.4.4.txt
Normal file
@ -0,0 +1,35 @@
|
||||
Git v2.4.4 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4.3
|
||||
------------------
|
||||
|
||||
* l10n updates for German.
|
||||
|
||||
* An earlier leakfix to bitmap testing code was incomplete.
|
||||
|
||||
* "git clean pathspec..." tried to lstat(2) and complain even for
|
||||
paths outside the given pathspec.
|
||||
|
||||
* Communication between the HTTP server and http_backend process can
|
||||
lead to a dead-lock when relaying a large ref negotiation request.
|
||||
Diagnose the situation better, and mitigate it by reading such a
|
||||
request first into core (to a reasonable limit).
|
||||
|
||||
* The clean/smudge interface did not work well when filtering an
|
||||
empty contents (failed and then passed the empty input through).
|
||||
It can be argued that a filter that produces anything but empty for
|
||||
an empty input is nonsense, but if the user wants to do strange
|
||||
things, then why not?
|
||||
|
||||
* Make "git stash something --help" error out, so that users can
|
||||
safely say "git stash drop --help".
|
||||
|
||||
* Clarify that "log --raw" and "log --format=raw" are unrelated
|
||||
concepts.
|
||||
|
||||
* Catch a programmer mistake to feed a pointer not an array to
|
||||
ARRAY_SIZE() macro, by using a couple of GCC extensions.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
28
Documentation/RelNotes/2.4.5.txt
Normal file
28
Documentation/RelNotes/2.4.5.txt
Normal file
@ -0,0 +1,28 @@
|
||||
Git v2.4.5 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4.4
|
||||
------------------
|
||||
|
||||
* The setup code used to die when core.bare and core.worktree are set
|
||||
inconsistently, even for commands that do not need working tree.
|
||||
|
||||
* There was a dead code that used to handle "git pull --tags" and
|
||||
show special-cased error message, which was made irrelevant when
|
||||
the semantics of the option changed back in Git 1.9 days.
|
||||
|
||||
* "color.diff.plain" was a misnomer; give it 'color.diff.context' as
|
||||
a more logical synonym.
|
||||
|
||||
* The configuration reader/writer uses mmap(2) interface to access
|
||||
the files; when we find a directory, it barfed with "Out of memory?".
|
||||
|
||||
* Recent "git prune" traverses young unreachable objects to safekeep
|
||||
old objects in the reachability chain from them, which sometimes
|
||||
showed unnecessary error messages that are alarming.
|
||||
|
||||
* "git rebase -i" fired post-rewrite hook when it shouldn't (namely,
|
||||
when it was told to stop sequencing with 'exec' insn).
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
23
Documentation/RelNotes/2.4.6.txt
Normal file
23
Documentation/RelNotes/2.4.6.txt
Normal file
@ -0,0 +1,23 @@
|
||||
Git v2.4.6 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4.5
|
||||
------------------
|
||||
|
||||
* "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
|
||||
a shallow transfer request even to an upload-pack that does not
|
||||
support the capability.
|
||||
|
||||
* "git fsck" used to ignore missing or invalid objects recorded in reflog.
|
||||
|
||||
* The tcsh completion writes a bash scriptlet but that would have
|
||||
failed for users with noclobber set.
|
||||
|
||||
* Recent Mac OS X updates breaks the logic to detect that the machine
|
||||
is on the AC power in the sample pre-auto-gc script.
|
||||
|
||||
* "git format-patch --ignore-if-upstream A..B" did not like to be fed
|
||||
tags as boundary commits.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
53
Documentation/RelNotes/2.4.7.txt
Normal file
53
Documentation/RelNotes/2.4.7.txt
Normal file
@ -0,0 +1,53 @@
|
||||
Git v2.4.7 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4.6
|
||||
------------------
|
||||
|
||||
* A minor regression to "git fsck" in v2.2 era was fixed; it
|
||||
complained about a body-less tag object when it lacked a
|
||||
separator empty line after its header to separate it with a
|
||||
non-existent body.
|
||||
|
||||
* We used to ask libCURL to use the most secure authentication method
|
||||
available when talking to an HTTP proxy only when we were told to
|
||||
talk to one via configuration variables. We now ask libCURL to
|
||||
always use the most secure authentication method, because the user
|
||||
can tell libCURL to use an HTTP proxy via an environment variable
|
||||
without using configuration variables.
|
||||
|
||||
* When you say "!<ENTER>" while running say "git log", you'd confuse
|
||||
yourself in the resulting shell, that may look as if you took
|
||||
control back to the original shell you spawned "git log" from but
|
||||
that isn't what is happening. To that new shell, we leaked
|
||||
GIT_PAGER_IN_USE environment variable that was meant as a local
|
||||
communication between the original "Git" and subprocesses that was
|
||||
spawned by it after we launched the pager, which caused many
|
||||
"interesting" things to happen, e.g. "git diff | cat" still paints
|
||||
its output in color by default.
|
||||
|
||||
Stop leaking that environment variable to the pager's half of the
|
||||
fork; we only need it on "Git" side when we spawn the pager.
|
||||
|
||||
* Avoid possible ssize_t to int truncation.
|
||||
|
||||
* "git config" failed to update the configuration file when the
|
||||
underlying filesystem is incapable of renaming a file that is still
|
||||
open.
|
||||
|
||||
* A minor bugfix when pack bitmap is used with "rev-list --count".
|
||||
|
||||
* An ancient test framework enhancement to allow color was not
|
||||
entirely correct; this makes it work even when tput needs to read
|
||||
from the ~/.terminfo under the user's real HOME directory.
|
||||
|
||||
* Fix a small bug in our use of umask() return value.
|
||||
|
||||
* "git rebase" did not exit with failure when format-patch it invoked
|
||||
failed for whatever reason.
|
||||
|
||||
* Disable "have we lost a race with competing repack?" check while
|
||||
receiving a huge object transfer that runs index-pack.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
21
Documentation/RelNotes/2.4.8.txt
Normal file
21
Documentation/RelNotes/2.4.8.txt
Normal file
@ -0,0 +1,21 @@
|
||||
Git v2.4.8 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4.7
|
||||
------------------
|
||||
|
||||
* Abandoning an already applied change in "git rebase -i" with
|
||||
"--continue" left CHERRY_PICK_HEAD and confused later steps.
|
||||
|
||||
* Various fixes around "git am" that applies a patch to a history
|
||||
that is not there yet.
|
||||
|
||||
* "git for-each-ref" reported "missing object" for 0{40} when it
|
||||
encounters a broken ref. The lack of object whose name is 0{40} is
|
||||
not the problem; the ref being broken is.
|
||||
|
||||
* "git commit --cleanup=scissors" was not careful enough to protect
|
||||
against getting fooled by a line that looked like scissors.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
9
Documentation/RelNotes/2.4.9.txt
Normal file
9
Documentation/RelNotes/2.4.9.txt
Normal file
@ -0,0 +1,9 @@
|
||||
Git v2.4.9 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.4.9
|
||||
------------------
|
||||
|
||||
* A handful of codepaths that used to use fixed-sized arrays to hold
|
||||
pathnames have been corrected to use strbuf and other mechanisms to
|
||||
allow longer pathnames without fearing overflows.
|
563
Documentation/RelNotes/2.5.0.txt
Normal file
563
Documentation/RelNotes/2.5.0.txt
Normal file
@ -0,0 +1,563 @@
|
||||
Git 2.5 Release Notes
|
||||
=====================
|
||||
|
||||
Updates since v2.4
|
||||
------------------
|
||||
|
||||
UI, Workflows & Features
|
||||
|
||||
* The bash completion script (in contrib/) learned a few options that
|
||||
"git revert" takes.
|
||||
|
||||
* Whitespace breakages in deleted and context lines can also be
|
||||
painted in the output of "git diff" and friends with the new
|
||||
--ws-error-highlight option.
|
||||
|
||||
* List of commands shown by "git help" are grouped along the workflow
|
||||
elements to help early learners.
|
||||
|
||||
* "git p4" now detects the filetype (e.g. binary) correctly even when
|
||||
the files are opened exclusively.
|
||||
|
||||
* git p4 attempts to better handle branches in Perforce.
|
||||
|
||||
* "git p4" learned "--changes-block-size <n>" to read the changes in
|
||||
chunks from Perforce, instead of making one call to "p4 changes"
|
||||
that may trigger "too many rows scanned" error from Perforce.
|
||||
|
||||
* More workaround for Perforce's row number limit in "git p4".
|
||||
|
||||
* Unlike "$EDITOR" and "$GIT_EDITOR" that can hold the path to the
|
||||
command and initial options (e.g. "/path/to/emacs -nw"), 'git p4'
|
||||
did not let the shell interpolate the contents of the environment
|
||||
variable that name the editor "$P4EDITOR" (and "$EDITOR", too).
|
||||
This release makes it in line with the rest of Git, as well as with
|
||||
Perforce.
|
||||
|
||||
* A new short-hand <branch>@{push} denotes the remote-tracking branch
|
||||
that tracks the branch at the remote the <branch> would be pushed
|
||||
to.
|
||||
|
||||
* "git show-branch --topics HEAD" (with no other arguments) did not
|
||||
do anything interesting. Instead, contrast the given revision
|
||||
against all the local branches by default.
|
||||
|
||||
* A replacement for contrib/workdir/git-new-workdir that does not
|
||||
rely on symbolic links and make sharing of objects and refs safer
|
||||
by making the borrowee and borrowers aware of each other.
|
||||
|
||||
Consider this as still an experimental feature; its UI is still
|
||||
likely to change.
|
||||
|
||||
* Tweak the sample "store" backend of the credential helper to honor
|
||||
XDG configuration file locations when specified.
|
||||
|
||||
* A heuristic we use to catch mistyped paths on the command line
|
||||
"git <cmd> <revs> <pathspec>" is to make sure that all the non-rev
|
||||
parameters in the later part of the command line are names of the
|
||||
files in the working tree, but that means "git grep $str -- \*.c"
|
||||
must always be disambiguated with "--", because nobody sane will
|
||||
create a file whose name literally is asterisk-dot-see. Loosen the
|
||||
heuristic to declare that with a wildcard string the user likely
|
||||
meant to give us a pathspec.
|
||||
|
||||
* "git merge FETCH_HEAD" learned that the previous "git fetch" could
|
||||
be to create an Octopus merge, i.e. recording multiple branches
|
||||
that are not marked as "not-for-merge"; this allows us to lose an
|
||||
old style invocation "git merge <msg> HEAD $commits..." in the
|
||||
implementation of "git pull" script; the old style syntax can now
|
||||
be deprecated (but not removed yet).
|
||||
|
||||
* Filter scripts were run with SIGPIPE disabled on the Git side,
|
||||
expecting that they may not read what Git feeds them to filter.
|
||||
We however treated a filter that does not read its input fully
|
||||
before exiting as an error. We no longer do and ignore EPIPE
|
||||
when writing to feed the filter scripts.
|
||||
|
||||
This changes semantics, but arguably in a good way. If a filter
|
||||
can produce its output without fully consuming its input using
|
||||
whatever magic, we now let it do so, instead of diagnosing it
|
||||
as a programming error.
|
||||
|
||||
* Instead of dying immediately upon failing to obtain a lock, the
|
||||
locking (of refs etc) retries after a short while with backoff.
|
||||
|
||||
* Introduce http.<url>.SSLCipherList configuration variable to tweak
|
||||
the list of cipher suite to be used with libcURL when talking with
|
||||
https:// sites.
|
||||
|
||||
* "git subtree" script (in contrib/) used "echo -n" to produce
|
||||
progress messages in a non-portable way.
|
||||
|
||||
* "git subtree" script (in contrib/) does not have --squash option
|
||||
when pushing, but the documentation and help text pretended as if
|
||||
it did.
|
||||
|
||||
* The Git subcommand completion (in contrib/) no longer lists credential
|
||||
helpers among candidates; they are not something the end user would
|
||||
invoke interactively.
|
||||
|
||||
* The index file can be taught with "update-index --untracked-cache"
|
||||
to optionally remember already seen untracked files, in order to
|
||||
speed up "git status" in a working tree with tons of cruft.
|
||||
|
||||
* "git mergetool" learned to drive WinMerge as a backend.
|
||||
|
||||
* "git upload-pack" that serves "git fetch" can be told to serve
|
||||
commits that are not at the tip of any ref, as long as they are
|
||||
reachable from a ref, with uploadpack.allowReachableSHA1InWant
|
||||
configuration variable.
|
||||
|
||||
* "git cat-file --batch(-check)" learned the "--follow-symlinks"
|
||||
option that follows an in-tree symbolic link when asked about an
|
||||
object via extended SHA-1 syntax, e.g. HEAD:RelNotes that points at
|
||||
Documentation/RelNotes/2.5.0.txt. With the new option, the command
|
||||
behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as
|
||||
input instead.
|
||||
|
||||
Consider this as still an experimental and incomplete feature:
|
||||
|
||||
- We may want to do the same for in-index objects, e.g.
|
||||
asking for :RelNotes with this option should give
|
||||
:Documentation/RelNotes/2.5.0.txt, too
|
||||
|
||||
- "git cat-file --follow-symlinks blob HEAD:RelNotes"
|
||||
may also be something we want to allow in the future.
|
||||
|
||||
* "git send-email" learned the alias file format used by the sendmail
|
||||
program (in a simplified form; we obviously do not feed pipes).
|
||||
|
||||
* Traditionally, external low-level 3-way merge drivers are expected
|
||||
to produce their results based solely on the contents of the three
|
||||
variants given in temporary files named by %O, %A and %B on their
|
||||
command line. Additionally allow them to look at the final path
|
||||
(given by %P).
|
||||
|
||||
* "git blame" learned blame.showEmail configuration variable.
|
||||
|
||||
* "git apply" cannot diagnose a patch corruption when the breakage is
|
||||
to mark the length of the hunk shorter than it really is on the
|
||||
hunk header line "@@ -l,k +m,n @@"; one special case it could is
|
||||
when the hunk becomes no-op (e.g. k == n == 2 for two-line context
|
||||
patch output), and it learned to do so in this special case.
|
||||
|
||||
* Add the "--allow-unknown-type" option to "cat-file" to allow
|
||||
inspecting loose objects of an experimental or a broken type.
|
||||
|
||||
* Many long-running operations show progress eye-candy, even when
|
||||
they are later backgrounded. Hide the eye-candy when the process
|
||||
is sent to the background instead.
|
||||
(merge a4fb76c lm/squelch-bg-progress later to maint).
|
||||
|
||||
|
||||
Performance, Internal Implementation, Development Support etc.
|
||||
|
||||
* "unsigned char [20]" used throughout the code to represent object
|
||||
names are being converted into a semi-opaque "struct object_id".
|
||||
This effort is expected to interfere with other topics in flight,
|
||||
but hopefully will give us one extra level of abstraction in the
|
||||
end, when completed.
|
||||
|
||||
* for_each_ref() callback functions were taught to name the objects
|
||||
not with "unsigned char sha1[20]" but with "struct object_id".
|
||||
|
||||
* Catch a programmer mistake to feed a pointer not an array to
|
||||
ARRAY_SIZE() macro, by using a couple of GCC extensions.
|
||||
|
||||
* Some error messages in "git config" were emitted without calling
|
||||
the usual error() facility.
|
||||
|
||||
* When "add--interactive" splits a hunk into two overlapping hunks
|
||||
and then let the user choose only one, it sometimes feeds an
|
||||
incorrect patch text to "git apply". Add tests to demonstrate
|
||||
this.
|
||||
|
||||
I have a slight suspicion that this may be $gmane/87202 coming back
|
||||
and biting us (I seem to have said "let's run with this and see
|
||||
what happens" back then).
|
||||
|
||||
* More line-ending tests.
|
||||
|
||||
* An earlier rewrite to use strbuf_getwholeline() instead of fgets(3)
|
||||
to read packed-refs file revealed that the former is unacceptably
|
||||
inefficient. It has been optimized by using getdelim(3) when
|
||||
available.
|
||||
|
||||
* The refs API uses ref_lock struct which had its own "int fd", even
|
||||
though the same file descriptor was in the lock struct it contains.
|
||||
Clean-up the code to lose this redundant field.
|
||||
|
||||
* There was a dead code that used to handle "git pull --tags" and
|
||||
show special-cased error message, which was made irrelevant when
|
||||
the semantics of the option changed back in Git 1.9 days.
|
||||
(merge 19d122b pt/pull-tags-error-diag later to maint).
|
||||
|
||||
* Help us to find broken test script that splits the body part of the
|
||||
test by mistaken use of wrong kind of quotes.
|
||||
(merge d93d5d5 jc/test-prereq-validate later to maint).
|
||||
|
||||
* Developer support to automatically detect broken &&-chain in the
|
||||
test scripts is now turned on by default.
|
||||
(merge 92b269f jk/test-chain-lint later to maint).
|
||||
|
||||
* Error reporting mechanism used in "refs" API has been made more
|
||||
consistent.
|
||||
|
||||
* "git pull" has more test coverage now.
|
||||
|
||||
* "git pull" has become more aware of the options meant for
|
||||
underlying "git fetch" and then learned to use parse-options
|
||||
parser.
|
||||
|
||||
* Clarify in the Makefile a guideline to decide use of USE_NSEC.
|
||||
|
||||
Also contains various documentation updates and code clean-ups.
|
||||
|
||||
|
||||
Fixes since v2.4
|
||||
----------------
|
||||
|
||||
Unless otherwise noted, all the fixes since v2.4 in the maintenance
|
||||
track are contained in this release (see the maintenance releases'
|
||||
notes for details).
|
||||
|
||||
* Git 2.4 broke setting verbosity and progress levels on "git clone"
|
||||
with native transports.
|
||||
(merge 822f0c4 mh/clone-verbosity-fix later to maint).
|
||||
|
||||
* "git add -e" did not allow the user to abort the operation by
|
||||
killing the editor.
|
||||
(merge cb64800 jk/add-e-kill-editor later to maint).
|
||||
|
||||
* Memory usage of "git index-pack" has been trimmed by tens of
|
||||
per-cent.
|
||||
(merge f0e7f11 nd/slim-index-pack-memory-usage later to maint).
|
||||
|
||||
* "git rev-list --objects $old --not --all" to see if everything that
|
||||
is reachable from $old is already connected to the existing refs
|
||||
was very inefficient.
|
||||
(merge b6e8a3b jk/still-interesting later to maint).
|
||||
|
||||
* "hash-object --literally" introduced in v2.2 was not prepared to
|
||||
take a really long object type name.
|
||||
(merge 1427a7f jc/hash-object later to maint).
|
||||
|
||||
* "git rebase --quiet" was not quite quiet when there is nothing to
|
||||
do.
|
||||
(merge 22946a9 jk/rebase-quiet-noop later to maint).
|
||||
|
||||
* The completion for "log --decorate=" parameter value was incorrect.
|
||||
(merge af16bda sg/complete-decorate-full-not-long later to maint).
|
||||
|
||||
* "filter-branch" corrupted commit log message that ends with an
|
||||
incomplete line on platforms with some "sed" implementations that
|
||||
munge such a line. Work it around by avoiding to use "sed".
|
||||
(merge df06201 jk/filter-branch-use-of-sed-on-incomplete-line later to maint).
|
||||
|
||||
* "git daemon" fails to build from the source under NO_IPV6
|
||||
configuration (regression in 2.4).
|
||||
(merge d358f77 jc/daemon-no-ipv6-for-2.4.1 later to maint).
|
||||
|
||||
* Some time ago, "git blame" (incorrectly) lost the convert_to_git()
|
||||
call when synthesizing a fake "tip" commit that represents the
|
||||
state in the working tree, which broke folks who record the history
|
||||
with LF line ending to make their project portable across platforms
|
||||
while terminating lines in their working tree files with CRLF for
|
||||
their platform.
|
||||
(merge 4bf256d tb/blame-resurrect-convert-to-git later to maint).
|
||||
|
||||
* We avoid setting core.worktree when the repository location is the
|
||||
".git" directory directly at the top level of the working tree, but
|
||||
the code misdetected the case in which the working tree is at the
|
||||
root level of the filesystem (which arguably is a silly thing to
|
||||
do, but still valid).
|
||||
(merge 84ccad8 jk/init-core-worktree-at-root later to maint).
|
||||
|
||||
* "git commit --date=now" or anything that relies on approxidate lost
|
||||
the daylight-saving-time offset.
|
||||
(merge f6e6362 jc/epochtime-wo-tz later to maint).
|
||||
|
||||
* Access to objects in repositories that borrow from another one on a
|
||||
slow NFS server unnecessarily got more expensive due to recent code
|
||||
becoming more cautious in a naive way not to lose objects to pruning.
|
||||
(merge ee1c6c3 jk/prune-mtime later to maint).
|
||||
|
||||
* The codepaths that read .gitignore and .gitattributes files have been
|
||||
taught that these files encoded in UTF-8 may have UTF-8 BOM marker at
|
||||
the beginning; this makes it in line with what we do for configuration
|
||||
files already.
|
||||
(merge 27547e5 cn/bom-in-gitignore later to maint).
|
||||
|
||||
* a few helper scripts in the test suite did not report errors
|
||||
correctly.
|
||||
(merge de248e9 ep/fix-test-lib-functions-report later to maint).
|
||||
|
||||
* The default $HOME/.gitconfig file created upon "git config --global"
|
||||
that edits it had incorrectly spelled user.name and user.email
|
||||
entries in it.
|
||||
(merge 7e11052 oh/fix-config-default-user-name-section later to maint).
|
||||
|
||||
* "git cat-file bl $blob" failed to barf even though there is no
|
||||
object type that is "bl".
|
||||
(merge b7994af jk/type-from-string-gently later to maint).
|
||||
|
||||
* The usual "git diff" when seeing a file turning into a directory
|
||||
showed a patchset to remove the file and create all files in the
|
||||
directory, but "git diff --no-index" simply refused to work. Also,
|
||||
when asked to compare a file and a directory, imitate POSIX "diff"
|
||||
and compare the file with the file with the same name in the
|
||||
directory, instead of refusing to run.
|
||||
(merge 0615173 jc/diff-no-index-d-f later to maint).
|
||||
|
||||
* "git rebase -i" moved the "current" command from "todo" to "done" a
|
||||
bit too prematurely, losing a step when a "pick" did not even start.
|
||||
(merge 8cbc57c ph/rebase-i-redo later to maint).
|
||||
|
||||
* The connection initiation code for "ssh" transport tried to absorb
|
||||
differences between the stock "ssh" and Putty-supplied "plink" and
|
||||
its derivatives, but the logic to tell that we are using "plink"
|
||||
variants were too loose and falsely triggered when "plink" appeared
|
||||
anywhere in the path (e.g. "/home/me/bin/uplink/ssh").
|
||||
(merge baaf233 bc/connect-plink later to maint).
|
||||
|
||||
* We have prepended $GIT_EXEC_PATH and the path "git" is installed in
|
||||
(typically "/usr/bin") to $PATH when invoking subprograms and hooks
|
||||
for almost eternity, but the original use case the latter tried to
|
||||
support was semi-bogus (i.e. install git to /opt/foo/git and run it
|
||||
without having /opt/foo on $PATH), and more importantly it has
|
||||
become less and less relevant as Git grew more mainstream (i.e. the
|
||||
users would _want_ to have it on their $PATH). Stop prepending the
|
||||
path in which "git" is installed to users' $PATH, as that would
|
||||
interfere the command search order people depend on (e.g. they may
|
||||
not like versions of programs that are unrelated to Git in /usr/bin
|
||||
and want to override them by having different ones in /usr/local/bin
|
||||
and have the latter directory earlier in their $PATH).
|
||||
(merge a0b4507 jk/git-no-more-argv0-path-munging later to maint).
|
||||
|
||||
* core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed
|
||||
to be overridden by repository-specific .git/info/exclude file, but
|
||||
the order was swapped from the beginning. This belatedly fixes it.
|
||||
(merge 099d2d8 jc/gitignore-precedence later to maint).
|
||||
|
||||
* There was a commented-out (instead of being marked to expect
|
||||
failure) test that documented a breakage that was fixed since the
|
||||
test was written; turn it into a proper test.
|
||||
(merge 66d2e04 sb/t1020-cleanup later to maint).
|
||||
|
||||
* The "log --decorate" enhancement in Git 2.4 that shows the commit
|
||||
at the tip of the current branch e.g. "HEAD -> master", did not
|
||||
work with --decorate=full.
|
||||
(merge 429ad20 mg/log-decorate-HEAD later to maint).
|
||||
|
||||
* The ref API did not handle cases where 'refs/heads/xyzzy/frotz' is
|
||||
removed at the same time as 'refs/heads/xyzzy' is added (or vice
|
||||
versa) very well.
|
||||
(merge c628edf mh/ref-directory-file later to maint).
|
||||
|
||||
* Multi-ref transaction support we merged a few releases ago
|
||||
unnecessarily kept many file descriptors open, risking to fail with
|
||||
resource exhaustion. This is for 2.4.x track.
|
||||
(merge 185ce3a mh/write-refs-sooner-2.4 later to maint).
|
||||
|
||||
* "git bundle verify" did not diagnose extra parameters on the
|
||||
command line.
|
||||
(merge 7886cfa ps/bundle-verify-arg later to maint).
|
||||
|
||||
* Various documentation mark-up fixes to make the output more
|
||||
consistent in general and also make AsciiDoctor (an alternative
|
||||
formatter) happier.
|
||||
(merge d0258b9 jk/asciidoc-markup-fix later to maint).
|
||||
(merge ad3967a jk/stripspace-asciidoctor-fix later to maint).
|
||||
(merge 975e382 ja/tutorial-asciidoctor-fix later to maint).
|
||||
|
||||
* The code to read pack-bitmap wanted to allocate a few hundred
|
||||
pointers to a structure, but by mistake allocated and leaked memory
|
||||
enough to hold that many actual structures. Correct the allocation
|
||||
size and also have it on stack, as it is small enough.
|
||||
(merge 599dc76 rs/plug-leak-in-pack-bitmaps later to maint).
|
||||
|
||||
* The pull.ff configuration was supposed to override the merge.ff
|
||||
configuration, but it didn't.
|
||||
(merge db9bb28 pt/pull-ff-vs-merge-ff later to maint).
|
||||
|
||||
* "git pull --log" and "git pull --no-log" worked as expected, but
|
||||
"git pull --log=20" did not.
|
||||
(merge 5061a44 pt/pull-log-n later to maint).
|
||||
|
||||
* "git rerere forget" in a repository without rerere enabled gave a
|
||||
cryptic error message; it should be a silent no-op instead.
|
||||
(merge 0544574 jk/rerere-forget-check-enabled later to maint).
|
||||
|
||||
* "git rebase -i" fired post-rewrite hook when it shouldn't (namely,
|
||||
when it was told to stop sequencing with 'exec' insn).
|
||||
(merge 141ff8f mm/rebase-i-post-rewrite-exec later to maint).
|
||||
|
||||
* Clarify that "log --raw" and "log --format=raw" are unrelated
|
||||
concepts.
|
||||
(merge 92de921 mm/log-format-raw-doc later to maint).
|
||||
|
||||
* Make "git stash something --help" error out, so that users can
|
||||
safely say "git stash drop --help".
|
||||
(merge 5ba2831 jk/stash-options later to maint).
|
||||
|
||||
* The clean/smudge interface did not work well when filtering an
|
||||
empty contents (failed and then passed the empty input through).
|
||||
It can be argued that a filter that produces anything but empty for
|
||||
an empty input is nonsense, but if the user wants to do strange
|
||||
things, then why not?
|
||||
(merge f6a1e1e jh/filter-empty-contents later to maint).
|
||||
|
||||
* Communication between the HTTP server and http_backend process can
|
||||
lead to a dead-lock when relaying a large ref negotiation request.
|
||||
Diagnose the situation better, and mitigate it by reading such a
|
||||
request first into core (to a reasonable limit).
|
||||
(merge 636614f jk/http-backend-deadlock later to maint).
|
||||
|
||||
* "git clean pathspec..." tried to lstat(2) and complain even for
|
||||
paths outside the given pathspec.
|
||||
(merge 838d6a9 dt/clean-pathspec-filter-then-lstat later to maint).
|
||||
|
||||
* Recent "git prune" traverses young unreachable objects to safekeep
|
||||
old objects in the reachability chain from them, which sometimes
|
||||
caused error messages that are unnecessarily alarming.
|
||||
(merge ce4e7b2 jk/squelch-missing-link-warning-for-unreachable later to maint).
|
||||
|
||||
* The configuration reader/writer uses mmap(2) interface to access
|
||||
the files; when we find a directory, it barfed with "Out of memory?".
|
||||
(merge 9ca0aaf jk/diagnose-config-mmap-failure later to maint).
|
||||
|
||||
* "color.diff.plain" was a misnomer; give it 'color.diff.context' as
|
||||
a more logical synonym.
|
||||
(merge 8dbf3eb jk/color-diff-plain-is-context later to maint).
|
||||
|
||||
* The setup code used to die when core.bare and core.worktree are set
|
||||
inconsistently, even for commands that do not need working tree.
|
||||
(merge fada767 jk/die-on-bogus-worktree-late later to maint).
|
||||
|
||||
* Recent Mac OS X updates breaks the logic to detect that the machine
|
||||
is on the AC power in the sample pre-auto-gc script.
|
||||
(merge c54c7b3 pa/auto-gc-mac-osx later to maint).
|
||||
|
||||
* "git commit --cleanup=scissors" was not careful enough to protect
|
||||
against getting fooled by a line that looked like scissors.
|
||||
(merge fbfa097 sg/commit-cleanup-scissors later to maint).
|
||||
|
||||
* "Have we lost a race with competing repack?" check was too
|
||||
expensive, especially while receiving a huge object transfer
|
||||
that runs index-pack (e.g. "clone" or "fetch").
|
||||
(merge 0eeb077 jk/index-pack-reduce-recheck later to maint).
|
||||
|
||||
* The tcsh completion writes a bash scriptlet but that would have
|
||||
failed for users with noclobber set.
|
||||
(merge 0b1f688 af/tcsh-completion-noclobber later to maint).
|
||||
|
||||
* "git for-each-ref" reported "missing object" for 0{40} when it
|
||||
encounters a broken ref. The lack of object whose name is 0{40} is
|
||||
not the problem; the ref being broken is.
|
||||
(merge 501cf47 mh/reporting-broken-refs-from-for-each-ref later to maint).
|
||||
|
||||
* Various fixes around "git am" that applies a patch to a history
|
||||
that is not there yet.
|
||||
(merge 6ea3b67 pt/am-abort-fix later to maint).
|
||||
|
||||
* "git fsck" used to ignore missing or invalid objects recorded in reflog.
|
||||
(merge 19bf6c9 mh/fsck-reflog-entries later to maint).
|
||||
|
||||
* "git format-patch --ignore-if-upstream A..B" did not like to be fed
|
||||
tags as boundary commits.
|
||||
(merge 9b7a61d jc/do-not-feed-tags-to-clear-commit-marks later to maint).
|
||||
|
||||
* "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
|
||||
a shallow transfer request even to an upload-pack that does not
|
||||
support the capability.
|
||||
(merge eb86a50 me/fetch-into-shallow-safety later to maint).
|
||||
|
||||
* "git rebase" did not exit with failure when format-patch it invoked
|
||||
failed for whatever reason.
|
||||
(merge 60d708b cb/rebase-am-exit-code later to maint).
|
||||
|
||||
* Fix a small bug in our use of umask() return value.
|
||||
(merge 3096b2e jk/fix-refresh-utime later to maint).
|
||||
|
||||
* An ancient test framework enhancement to allow color was not
|
||||
entirely correct; this makes it work even when tput needs to read
|
||||
from the ~/.terminfo under the user's real HOME directory.
|
||||
(merge d5c1b7c rh/test-color-avoid-terminfo-in-original-home later to maint).
|
||||
|
||||
* A minor bugfix when pack bitmap is used with "rev-list --count".
|
||||
(merge c8a70d3 jk/rev-list-no-bitmap-while-pruning later to maint).
|
||||
|
||||
* "git config" failed to update the configuration file when the
|
||||
underlying filesystem is incapable of renaming a file that is still
|
||||
open.
|
||||
(merge 7a64592 kb/config-unmap-before-renaming later to maint).
|
||||
|
||||
* Avoid possible ssize_t to int truncation.
|
||||
(merge 6c8afe4 mh/strbuf-read-file-returns-ssize-t later to maint).
|
||||
|
||||
* When you say "!<ENTER>" while running say "git log", you'd confuse
|
||||
yourself in the resulting shell, that may look as if you took
|
||||
control back to the original shell you spawned "git log" from but
|
||||
that isn't what is happening. To that new shell, we leaked
|
||||
GIT_PAGER_IN_USE environment variable that was meant as a local
|
||||
communication between the original "Git" and subprocesses that was
|
||||
spawned by it after we launched the pager, which caused many
|
||||
"interesting" things to happen, e.g. "git diff | cat" still paints
|
||||
its output in color by default.
|
||||
|
||||
Stop leaking that environment variable to the pager's half of the
|
||||
fork; we only need it on "Git" side when we spawn the pager.
|
||||
(merge 124b519 jc/unexport-git-pager-in-use-in-pager later to maint).
|
||||
|
||||
* Abandoning an already applied change in "git rebase -i" with
|
||||
"--continue" left CHERRY_PICK_HEAD and confused later steps.
|
||||
(merge 0e0aff4 js/rebase-i-clean-up-upon-continue-to-skip later to maint).
|
||||
|
||||
* We used to ask libCURL to use the most secure authentication method
|
||||
available when talking to an HTTP proxy only when we were told to
|
||||
talk to one via configuration variables. We now ask libCURL to
|
||||
always use the most secure authentication method, because the user
|
||||
can tell libCURL to use an HTTP proxy via an environment variable
|
||||
without using configuration variables.
|
||||
(merge 5841520 et/http-proxyauth later to maint).
|
||||
|
||||
* A fix to a minor regression to "git fsck" in v2.2 era that started
|
||||
complaining about a body-less tag object when it lacks a separator
|
||||
empty line after its header to separate it with a non-existent body.
|
||||
(merge 84d18c0 jc/fsck-retire-require-eoh later to maint).
|
||||
|
||||
* Code cleanups and documentation updates.
|
||||
(merge 0269f96 mm/usage-log-l-can-take-regex later to maint).
|
||||
(merge 64f2589 nd/t1509-chroot-test later to maint).
|
||||
(merge d201a1e sb/test-bitmap-free-at-end later to maint).
|
||||
(merge 05bfc7d sb/line-log-plug-pairdiff-leak later to maint).
|
||||
(merge 846e5df pt/xdg-config-path later to maint).
|
||||
(merge 1154aa4 jc/plug-fmt-merge-msg-leak later to maint).
|
||||
(merge 319b678 jk/sha1-file-reduce-useless-warnings later to maint).
|
||||
(merge 9a35c14 fg/document-commit-message-stripping later to maint).
|
||||
(merge bbf431c ps/doc-packfile-vs-pack-file later to maint).
|
||||
(merge 309a9e3 jk/skip-http-tests-under-no-curl later to maint).
|
||||
(merge ccd593c dl/branch-error-message later to maint).
|
||||
(merge 22570b6 rs/janitorial later to maint).
|
||||
(merge 5c2a581 mc/commit-doc-grammofix later to maint).
|
||||
(merge ce41720 ah/usage-strings later to maint).
|
||||
(merge e6a268c sb/glossary-submodule later to maint).
|
||||
(merge ec48a76 sb/submodule-doc-intro later to maint).
|
||||
(merge 14f8b9b jk/clone-dissociate later to maint).
|
||||
(merge 055c7e9 sb/pack-protocol-mention-smart-http later to maint).
|
||||
(merge 7c37a5d jk/make-fix-dependencies later to maint).
|
||||
(merge fc0aa39 sg/merge-summary-config later to maint).
|
||||
(merge 329af6c pt/t0302-needs-sanity later to maint).
|
||||
(merge d614f07 fk/doc-format-patch-vn later to maint).
|
||||
(merge 72dbb36 sg/completion-commit-cleanup later to maint).
|
||||
(merge e654eb2 es/utf8-stupid-compiler-workaround later to maint).
|
||||
(merge 34b935c es/osx-header-pollutes-mask-macro later to maint).
|
||||
(merge ab7fade jc/prompt-document-ps1-state-separator later to maint).
|
||||
(merge 25f600e mm/describe-doc later to maint).
|
||||
(merge 83fe167 mm/branch-doc-updates later to maint).
|
||||
(merge 75d2e5a ls/hint-rev-list-count later to maint).
|
||||
(merge edc8f71 cb/subtree-tests-update later to maint).
|
||||
(merge 5330e6e sb/p5310-and-chain later to maint).
|
||||
(merge c4ac525 tb/checkout-doc later to maint).
|
||||
(merge e479c5f jk/pretty-encoding-doc later to maint).
|
||||
(merge 7e837c6 ss/clone-guess-dir-name-simplify later to maint).
|
65
Documentation/RelNotes/2.5.1.txt
Normal file
65
Documentation/RelNotes/2.5.1.txt
Normal file
@ -0,0 +1,65 @@
|
||||
Git v2.5.1 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.5
|
||||
----------------
|
||||
|
||||
* Running an aliased command from a subdirectory when the .git thing
|
||||
in the working tree is a gitfile pointing elsewhere did not work.
|
||||
|
||||
* Often a fast-import stream builds a new commit on top of the
|
||||
previous commit it built, and it often unconditionally emits a
|
||||
"from" command to specify the first parent, which can be omitted in
|
||||
such a case. This caused fast-import to forget the tree of the
|
||||
previous commit and then re-read it from scratch, which was
|
||||
inefficient. Optimize for this common case.
|
||||
|
||||
* The "rev-parse --parseopt" mode parsed the option specification
|
||||
and the argument hint in a strange way to allow '=' and other
|
||||
special characters in the option name while forbidding them from
|
||||
the argument hint. This made it impossible to define an option
|
||||
like "--pair <key>=<value>" with "pair=key=value" specification,
|
||||
which instead would have defined a "--pair=key <value>" option.
|
||||
|
||||
* A "rebase" replays changes of the local branch on top of something
|
||||
else, as such they are placed in stage #3 and referred to as
|
||||
"theirs", while the changes in the new base, typically a foreign
|
||||
work, are placed in stage #2 and referred to as "ours". Clarify
|
||||
the "checkout --ours/--theirs".
|
||||
|
||||
* An experimental "untracked cache" feature used uname(2) in a
|
||||
slightly unportable way.
|
||||
|
||||
* "sparse checkout" misbehaved for a path that is excluded from the
|
||||
checkout when switching between branches that differ at the path.
|
||||
|
||||
* The low-level "git send-pack" did not honor 'user.signingkey'
|
||||
configuration variable when sending a signed-push.
|
||||
|
||||
* An attempt to delete a ref by pushing into a repository whose HEAD
|
||||
symbolic reference points at an unborn branch that cannot be
|
||||
created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
|
||||
points at refs/heads/a) failed.
|
||||
|
||||
* "git subtree" (in contrib/) depended on "git log" output to be
|
||||
stable, which was a no-no. Apply a workaround to force a
|
||||
particular date format.
|
||||
|
||||
* "git clone $URL" in recent releases of Git contains a regression in
|
||||
the code that invents a new repository name incorrectly based on
|
||||
the $URL. This has been corrected.
|
||||
(merge db2e220 jk/guess-repo-name-regression-fix later to maint).
|
||||
|
||||
* Running tests with the "-x" option to make them verbose had some
|
||||
unpleasant interactions with other features of the test suite.
|
||||
(merge 9b5fe78 jk/test-with-x later to maint).
|
||||
|
||||
* "git pull" in recent releases of Git has a regression in the code
|
||||
that allows custom path to the --upload-pack=<program>. This has
|
||||
been corrected.
|
||||
|
||||
* pipe() emulation used in Git for Windows looked at a wrong variable
|
||||
when checking for an error from an _open_osfhandle() call.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
63
Documentation/RelNotes/2.5.2.txt
Normal file
63
Documentation/RelNotes/2.5.2.txt
Normal file
@ -0,0 +1,63 @@
|
||||
Git v2.5.2 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.5.1
|
||||
------------------
|
||||
|
||||
* "git init empty && git -C empty log" said "bad default revision 'HEAD'",
|
||||
which was found to be a bit confusing to new users.
|
||||
|
||||
* The "interpret-trailers" helper mistook a multi-paragraph title of
|
||||
a commit log message with a colon in it as the end of the trailer
|
||||
block.
|
||||
|
||||
* When re-priming the cache-tree opportunistically while committing
|
||||
the in-core index as-is, we mistakenly invalidated the in-core
|
||||
index too aggressively, causing the experimental split-index code
|
||||
to unnecessarily rewrite the on-disk index file(s).
|
||||
|
||||
* "git archive" did not use zip64 extension when creating an archive
|
||||
with more than 64k entries, which nobody should need, right ;-)?
|
||||
|
||||
* The code in "multiple-worktree" support that attempted to recover
|
||||
from an inconsistent state updated an incorrect file.
|
||||
|
||||
* "git rev-list" does not take "--notes" option, but did not complain
|
||||
when one is given.
|
||||
|
||||
* Because the configuration system does not allow "alias.0foo" and
|
||||
"pager.0foo" as the configuration key, the user cannot use '0foo'
|
||||
as a custom command name anyway, but "git 0foo" tried to look these
|
||||
keys up and emitted useless warnings before saying '0foo is not a
|
||||
git command'. These warning messages have been squelched.
|
||||
|
||||
* We recently rewrote one of the build scripts in Perl, which made it
|
||||
necessary to have Perl to build Git. Reduced Perl dependency by
|
||||
rewriting it again using sed.
|
||||
|
||||
* t1509 test that requires a dedicated VM environment had some
|
||||
bitrot, which has been corrected.
|
||||
|
||||
* strbuf_read() used to have one extra iteration (and an unnecessary
|
||||
strbuf_grow() of 8kB), which was eliminated.
|
||||
|
||||
* The codepath to produce error messages had a hard-coded limit to
|
||||
the size of the message, primarily to avoid memory allocation while
|
||||
calling die().
|
||||
|
||||
* When trying to see that an object does not exist, a state errno
|
||||
leaked from our "first try to open a packfile with O_NOATIME and
|
||||
then if it fails retry without it" logic on a system that refuses
|
||||
O_NOATIME. This confused us and caused us to die, saying that the
|
||||
packfile is unreadable, when we should have just reported that the
|
||||
object does not exist in that packfile to the caller.
|
||||
|
||||
* An off-by-one error made "git remote" to mishandle a remote with a
|
||||
single letter nickname.
|
||||
|
||||
* A handful of codepaths that used to use fixed-sized arrays to hold
|
||||
pathnames have been corrected to use strbuf and other mechanisms to
|
||||
allow longer pathnames without fearing overflows.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
17
Documentation/RelNotes/2.5.3.txt
Normal file
17
Documentation/RelNotes/2.5.3.txt
Normal file
@ -0,0 +1,17 @@
|
||||
Git v2.5.3 Release Notes
|
||||
========================
|
||||
|
||||
Fixes since v2.5.2
|
||||
------------------
|
||||
|
||||
* The experimental untracked-cache feature were buggy when paths with
|
||||
a few levels of subdirectories are involved.
|
||||
|
||||
* Recent versions of scripted "git am" has a performance regression
|
||||
in "git am --skip" codepath, which no longer exists in the
|
||||
built-in version on the 'master' front. Fix the regression in
|
||||
the last scripted version that appear in 2.5.x maintenance track
|
||||
and older.
|
||||
|
||||
Also contains typofixes, documentation updates and trivial code
|
||||
clean-ups.
|
370
Documentation/RelNotes/2.6.0.txt
Normal file
370
Documentation/RelNotes/2.6.0.txt
Normal file
@ -0,0 +1,370 @@
|
||||
Git 2.6 Release Notes
|
||||
=====================
|
||||
|
||||
Updates since v2.5
|
||||
------------------
|
||||
|
||||
UI, Workflows & Features
|
||||
|
||||
* An asterisk as a substring (as opposed to the entirety) of a path
|
||||
component for both side of a refspec, e.g.
|
||||
"refs/heads/o*:refs/remotes/heads/i*", is now allowed.
|
||||
|
||||
* New userdiff pattern definition for fountain screenwriting markup
|
||||
format has been added.
|
||||
|
||||
* "git log" and friends learned a new "--date=format:..." option to
|
||||
format timestamps using system's strftime(3).
|
||||
|
||||
* "git fast-import" learned to respond to the get-mark command via
|
||||
its cat-blob-fd interface.
|
||||
|
||||
* "git rebase -i" learned "drop commit-object-name subject" command
|
||||
as another way to skip replaying of a commit.
|
||||
|
||||
* A new configuration variable can enable "--follow" automatically
|
||||
when "git log" is run with one pathspec argument.
|
||||
|
||||
* "git status" learned to show a more detailed information regarding
|
||||
the "rebase -i" session in progress.
|
||||
|
||||
* "git cat-file" learned "--batch-all-objects" option to enumerate all
|
||||
available objects in the repository more quickly than "rev-list
|
||||
--all --objects" (the output includes unreachable objects, though).
|
||||
|
||||
* "git fsck" learned to ignore errors on a set of known-to-be-bad
|
||||
objects, and also allows the warning levels of various kinds of
|
||||
non-critical breakages to be tweaked.
|
||||
|
||||
* "git rebase -i"'s list of todo is made configurable.
|
||||
|
||||
* "git send-email" now performs alias-expansion on names that are
|
||||
given via --cccmd, etc.
|
||||
|
||||
* An environment variable GIT_REPLACE_REF_BASE tells Git to look into
|
||||
refs hierarchy other than refs/replace/ for the object replacement
|
||||
data.
|
||||
|
||||
* Allow untracked cache (experimental) to be used when sparse
|
||||
checkout (experimental) is also in use.
|
||||
|
||||
* "git pull --rebase" has been taught to pay attention to
|
||||
rebase.autostash configuration.
|
||||
|
||||
* The command-line completion script (in contrib/) has been updated.
|
||||
|
||||
* A negative !ref entry in multi-value transfer.hideRefs
|
||||
configuration can be used to say "don't hide this one".
|
||||
|
||||
* After "git am" without "-3" stops, running "git am -3" pays attention
|
||||
to "-3" only for the patch that caused the original invocation
|
||||
to stop.
|
||||
|
||||
* When linked worktree is used, simultaneous "notes merge" instances
|
||||
for the same ref in refs/notes/* are prevented from stomping on
|
||||
each other.
|
||||
|
||||
* "git send-email" learned a new option --smtp-auth to limit the SMTP
|
||||
AUTH mechanisms to be used to a subset of what the system library
|
||||
supports.
|
||||
|
||||
* A new configuration variable http.sslVersion can be used to specify
|
||||
what specific version of SSL/TLS to use to make a connection.
|
||||
|
||||
* "git notes merge" can be told with "--strategy=<how>" option how to
|
||||
automatically handle conflicts; this can now be configured by
|
||||
setting notes.mergeStrategy configuration variable.
|
||||
|
||||
* "git log --cc" did not show any patch, even though most of the time
|
||||
the user meant "git log --cc -p -m" to see patch output for commits
|
||||
with a single parent, and combined diff for merge commits. The
|
||||
command is taught to DWIM "--cc" (without "--raw" and other forms
|
||||
of output specification) to "--cc -p -m".
|
||||
|
||||
* "git config --list" output was hard to parse when values consist of
|
||||
multiple lines. "--name-only" option is added to help this.
|
||||
|
||||
* A handful of usability & cosmetic fixes to gitk and l10n updates.
|
||||
|
||||
* A completely empty e-mail address <> is now allowed in the authors
|
||||
file used by git-svn, to match the way it accepts the output from
|
||||
authors-prog.
|
||||
|
||||
|
||||
Performance, Internal Implementation, Development Support etc.
|
||||
|
||||
* In preparation for allowing different "backends" to store the refs
|
||||
in a way different from the traditional "one ref per file in
|
||||
$GIT_DIR or in a $GIT_DIR/packed-refs file" filesystem storage,
|
||||
direct filesystem access to ref-like things like CHERRY_PICK_HEAD
|
||||
from scripts and programs has been reduced.
|
||||
|
||||
* Computation of untracked status indicator by bash prompt
|
||||
script (in contrib/) has been optimized.
|
||||
|
||||
* Memory use reduction when commit-slab facility is used to annotate
|
||||
sparsely (which is not recommended in the first place).
|
||||
|
||||
* Clean up refs API and make "git clone" less intimate with the
|
||||
implementation detail.
|
||||
|
||||
* "git pull" was reimplemented in C.
|
||||
|
||||
* The packet tracing machinery allows to capture an incoming pack
|
||||
data to a file for debugging.
|
||||
|
||||
* Move machinery to parse human-readable scaled numbers like 1k, 4M,
|
||||
and 2G as an option parameter's value from pack-objects to
|
||||
parse-options API, to make it available to other codepaths.
|
||||
|
||||
* "git verify-tag" and "git verify-commit" have been taught to share
|
||||
more code, and then learned to optionally show the verification
|
||||
message from the underlying GPG implementation.
|
||||
|
||||
* Various enhancements around "git am" reading patches generated by
|
||||
foreign SCM have been made.
|
||||
|
||||
* Ref listing by "git branch -l" and "git tag -l" commands has
|
||||
started to be rebuilt, based on the for-each-ref machinery.
|
||||
|
||||
* The code to perform multi-tree merges has been taught to repopulate
|
||||
the cache-tree upon a successful merge into the index, so that
|
||||
subsequent "diff-index --cached" (hence "status") and "write-tree"
|
||||
(hence "commit") will go faster.
|
||||
|
||||
The same logic in "git checkout" may now be removed, but that is a
|
||||
separate issue.
|
||||
|
||||
* Tests that assume how reflogs are represented on the filesystem too
|
||||
much have been corrected.
|
||||
|
||||
* "git am" has been rewritten in "C".
|
||||
|
||||
* git_path() and mkpath() are handy helper functions but it is easy
|
||||
to misuse, as the callers need to be careful to keep the number of
|
||||
active results below 4. Their uses have been reduced.
|
||||
|
||||
* The "lockfile" API has been rebuilt on top of a new "tempfile" API.
|
||||
|
||||
* To prepare for allowing a different "ref" backend to be plugged in
|
||||
to the system, update_ref()/delete_ref() have been taught about
|
||||
ref-like things like MERGE_HEAD that are per-worktree (they will
|
||||
always be written to the filesystem inside $GIT_DIR).
|
||||
|
||||
* The gitmodules API that is accessed from the C code learned to
|
||||
cache stuff lazily.
|
||||
|
||||
|
||||
Also contains various documentation updates and code clean-ups.
|
||||
|
||||
|
||||
Fixes since v2.5
|
||||
----------------
|
||||
|
||||
Unless otherwise noted, all the fixes since v2.5 in the maintenance
|
||||
track are contained in this release (see the maintenance releases'
|
||||
notes for details).
|
||||
|
||||
* "git subtree" (in contrib/) depended on "git log" output to be
|
||||
stable, which was a no-no. Apply a workaround to force a
|
||||
particular date format.
|
||||
(merge e7aac44 da/subtree-date-confusion later to maint).
|
||||
|
||||
* An attempt to delete a ref by pushing into a repository whose HEAD
|
||||
symbolic reference points at an unborn branch that cannot be
|
||||
created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
|
||||
points at refs/heads/a) failed.
|
||||
(merge b112b14 jx/do-not-crash-receive-pack-wo-head later to maint).
|
||||
|
||||
* The low-level "git send-pack" did not honor 'user.signingkey'
|
||||
configuration variable when sending a signed-push.
|
||||
(merge d830d39 db/send-pack-user-signingkey later to maint).
|
||||
|
||||
* "sparse checkout" misbehaved for a path that is excluded from the
|
||||
checkout when switching between branches that differ at the path.
|
||||
(merge 7d78241 as/sparse-checkout-removal later to maint).
|
||||
|
||||
* An experimental "untracked cache" feature used uname(2) in a
|
||||
slightly unportable way.
|
||||
(merge 100e433 cb/uname-in-untracked later to maint).
|
||||
|
||||
* A "rebase" replays changes of the local branch on top of something
|
||||
else, as such they are placed in stage #3 and referred to as
|
||||
"theirs", while the changes in the new base, typically a foreign
|
||||
work, are placed in stage #2 and referred to as "ours". Clarify
|
||||
the "checkout --ours/--theirs".
|
||||
(merge f303016 se/doc-checkout-ours-theirs later to maint).
|
||||
|
||||
* The "rev-parse --parseopt" mode parsed the option specification
|
||||
and the argument hint in a strange way to allow '=' and other
|
||||
special characters in the option name while forbidding them from
|
||||
the argument hint. This made it impossible to define an option
|
||||
like "--pair <key>=<value>" with "pair=key=value" specification,
|
||||
which instead would have defined a "--pair=key <value>" option.
|
||||
(merge 2d893df ib/scripted-parse-opt-better-hint-string later to maint).
|
||||
|
||||
* Often a fast-import stream builds a new commit on top of the
|
||||
previous commit it built, and it often unconditionally emits a
|
||||
"from" command to specify the first parent, which can be omitted in
|
||||
such a case. This caused fast-import to forget the tree of the
|
||||
previous commit and then re-read it from scratch, which was
|
||||
inefficient. Optimize for this common case.
|
||||
(merge 0df3245 mh/fast-import-optimize-current-from later to maint).
|
||||
|
||||
* Running an aliased command from a subdirectory when the .git thing
|
||||
in the working tree is a gitfile pointing elsewhere did not work.
|
||||
(merge d95138e nd/export-worktree later to maint).
|
||||
|
||||
* "Is this subdirectory a separate repository that should not be
|
||||
touched?" check "git clean" was inefficient. This was replaced
|
||||
with a more optimized check.
|
||||
(merge fbf2fec ee/clean-remove-dirs later to maint).
|
||||
|
||||
* The "new-worktree-mode" hack in "checkout" that was added in
|
||||
nd/multiple-work-trees topic has been removed by updating the
|
||||
implementation of new "worktree add".
|
||||
(merge 65f9b75 es/worktree-add-cleanup later to maint).
|
||||
|
||||
* Remove remaining cruft from "git checkout --to", which
|
||||
transitioned to "git worktree add".
|
||||
(merge 114ff88 es/worktree-add later to maint).
|
||||
|
||||
* An off-by-one error made "git remote" to mishandle a remote with a
|
||||
single letter nickname.
|
||||
(merge bc598c3 mh/get-remote-group-fix later to maint).
|
||||
|
||||
* "git clone $URL", when cloning from a site whose sole purpose is to
|
||||
host a single repository (hence, no path after <scheme>://<site>/),
|
||||
tried to use the site name as the new repository name, but did not
|
||||
remove username or password when <site> part was of the form
|
||||
<user>@<pass>:<host>. The code is taught to redact these.
|
||||
(merge adef956 ps/guess-repo-name-at-root later to maint).
|
||||
|
||||
* Running tests with the "-x" option to make them verbose had some
|
||||
unpleasant interactions with other features of the test suite.
|
||||
(merge 9b5fe78 jk/test-with-x later to maint).
|
||||
|
||||
* t1509 test that requires a dedicated VM environment had some
|
||||
bitrot, which has been corrected.
|
||||
(merge faacc5a ps/t1509-chroot-test-fixup later to maint).
|
||||
|
||||
* "git pull" in recent releases of Git has a regression in the code
|
||||
that allows custom path to the --upload-pack=<program>. This has
|
||||
been corrected.
|
||||
|
||||
Note that this is irrelevant for 'master' with "git pull" rewritten
|
||||
in C.
|
||||
(merge 13e0e28 mm/pull-upload-pack later to maint).
|
||||
|
||||
* When trying to see that an object does not exist, a state errno
|
||||
leaked from our "first try to open a packfile with O_NOATIME and
|
||||
then if it fails retry without it" logic on a system that refuses
|
||||
O_NOATIME. This confused us and caused us to die, saying that the
|
||||
packfile is unreadable, when we should have just reported that the
|
||||
object does not exist in that packfile to the caller.
|
||||
(merge dff6f28 cb/open-noatime-clear-errno later to maint).
|
||||
|
||||
* The codepath to produce error messages had a hard-coded limit to
|
||||
the size of the message, primarily to avoid memory allocation while
|
||||
calling die().
|
||||
(merge f4c3edc jk/long-error-messages later to maint).
|
||||
|
||||
* strbuf_read() used to have one extra iteration (and an unnecessary
|
||||
strbuf_grow() of 8kB), which was eliminated.
|
||||
(merge 3ebbd00 jh/strbuf-read-use-read-in-full later to maint).
|
||||
|
||||
* We rewrote one of the build scripts in Perl but this reimplements
|
||||
in Bourne shell.
|
||||
(merge 57cee8a sg/help-group later to maint).
|
||||
|
||||
* The experimental untracked-cache feature were buggy when paths with
|
||||
a few levels of subdirectories are involved.
|
||||
(merge 73f9145 dt/untracked-subdir later to maint).
|
||||
|
||||
* "interpret-trailers" helper mistook a single-liner log message that
|
||||
has a colon as the end of existing trailer.
|
||||
|
||||
* The "interpret-trailers" helper mistook a multi-paragraph title of
|
||||
a commit log message with a colon in it as the end of the trailer
|
||||
block.
|
||||
(merge 5c99995 cc/trailers-corner-case-fix later to maint).
|
||||
|
||||
* "git describe" without argument defaulted to describe the HEAD
|
||||
commit, but "git describe --contains" didn't. Arguably, in a
|
||||
repository used for active development, such defaulting would not
|
||||
be very useful as the tip of branch is typically not tagged, but it
|
||||
is better to be consistent.
|
||||
(merge 2bd0706 sg/describe-contains later to maint).
|
||||
|
||||
* The client side codepaths in "git push" have been cleaned up
|
||||
and the user can request to perform an optional "signed push",
|
||||
i.e. sign only when the other end accepts signed push.
|
||||
(merge 68c757f db/push-sign-if-asked later to maint).
|
||||
|
||||
* Because the configuration system does not allow "alias.0foo" and
|
||||
"pager.0foo" as the configuration key, the user cannot use '0foo'
|
||||
as a custom command name anyway, but "git 0foo" tried to look these
|
||||
keys up and emitted useless warnings before saying '0foo is not a
|
||||
git command'. These warning messages have been squelched.
|
||||
(merge 9e9de18 jk/fix-alias-pager-config-key-warnings later to maint).
|
||||
|
||||
* "git rev-list" does not take "--notes" option, but did not complain
|
||||
when one is given.
|
||||
(merge 2aea7a5 jk/rev-list-has-no-notes later to maint).
|
||||
|
||||
* When re-priming the cache-tree opportunistically while committing
|
||||
the in-core index as-is, we mistakenly invalidated the in-core
|
||||
index too aggressively, causing the experimental split-index code
|
||||
to unnecessarily rewrite the on-disk index file(s).
|
||||
(merge 475a344 dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update later to maint).
|
||||
|
||||
* "git archive" did not use zip64 extension when creating an archive
|
||||
with more than 64k entries, which nobody should need, right ;-)?
|
||||
(merge 88329ca rs/archive-zip-many later to maint).
|
||||
|
||||
* The code in "multiple-worktree" support that attempted to recover
|
||||
from an inconsistent state updated an incorrect file.
|
||||
(merge 82fde87 nd/fixup-linked-gitdir later to maint).
|
||||
|
||||
* On case insensitive systems, "git p4" did not work well with client
|
||||
specs.
|
||||
|
||||
* "git init empty && git -C empty log" said "bad default revision 'HEAD'",
|
||||
which was found to be a bit confusing to new users.
|
||||
(merge ce11360 jk/log-missing-default-HEAD later to maint).
|
||||
|
||||
* Recent versions of scripted "git am" has a performance regression in
|
||||
"git am --skip" codepath, which no longer exists in the built-in
|
||||
version on the 'master' front. Fix the regression in the last
|
||||
scripted version that appear in 2.5.x maintenance track and older.
|
||||
(merge b9d6689 js/maint-am-skip-performance-regression later to maint).
|
||||
|
||||
* The branch descriptions that are set with "git branch --edit-description"
|
||||
option were used in many places but they weren't clearly documented.
|
||||
(merge 561d2b7 po/doc-branch-desc later to maint).
|
||||
|
||||
* Code cleanups and documentation updates.
|
||||
(merge 1c601af es/doc-clean-outdated-tools later to maint).
|
||||
(merge 3581304 kn/tag-doc-fix later to maint).
|
||||
(merge 3a59e59 kb/i18n-doc later to maint).
|
||||
(merge 45abdee sb/remove-unused-var-from-builtin-add later to maint).
|
||||
(merge 14691e3 sb/parse-options-codeformat later to maint).
|
||||
(merge 4a6ada3 ad/bisect-cleanup later to maint).
|
||||
(merge da4c5ad ta/docfix-index-format-tech later to maint).
|
||||
(merge ae25fd3 sb/check-return-from-read-ref later to maint).
|
||||
(merge b3325df nd/dwim-wildcards-as-pathspecs later to maint).
|
||||
(merge 7aa9b9b sg/wt-status-header-inclusion later to maint).
|
||||
(merge f04c690 as/docfix-reflog-expire-unreachable later to maint).
|
||||
(merge 1269847 sg/t3020-typofix later to maint).
|
||||
(merge 8b54c23 jc/calloc-pathspec later to maint).
|
||||
(merge a6926b8 po/po-readme later to maint).
|
||||
(merge 54d160e ss/fix-config-fd-leak later to maint).
|
||||
(merge b80fa84 ah/submodule-typofix-in-error later to maint).
|
||||
(merge 99885bc ah/reflog-typofix-in-error later to maint).
|
||||
(merge 9476c2c ah/read-tree-usage-string later to maint).
|
||||
(merge b8c1d27 ah/pack-objects-usage-strings later to maint).
|
||||
(merge 486e1e1 br/svn-doc-include-paths-config later to maint).
|
||||
(merge 1733ed3 ee/clean-test-fixes later to maint).
|
||||
(merge 5fcadc3 gb/apply-comment-typofix later to maint).
|
||||
(merge b894d3e mp/t7060-diff-index-test later to maint).
|
||||
(merge d238710 as/config-doc-markup-fix later to maint).
|
@ -57,7 +57,8 @@ change, the approach taken by the change, and if relevant how this
|
||||
differs substantially from the prior version, are all good things
|
||||
to have.
|
||||
|
||||
Make sure that you have tests for the bug you are fixing.
|
||||
Make sure that you have tests for the bug you are fixing. See
|
||||
t/README for guidance.
|
||||
|
||||
When adding a new feature, make sure that you have new tests to show
|
||||
the feature triggers the new behaviour when it should, and to show the
|
||||
@ -135,6 +136,11 @@ that is fine, but please mark it as such.
|
||||
|
||||
(4) Sending your patches.
|
||||
|
||||
Learn to use format-patch and send-email if possible. These commands
|
||||
are optimized for the workflow of sending patches, avoiding many ways
|
||||
your existing e-mail client that is optimized for "multipart/*" mime
|
||||
type e-mails to corrupt and render your patches unusable.
|
||||
|
||||
People on the Git mailing list need to be able to read and
|
||||
comment on the changes you are submitting. It is important for
|
||||
a developer to be able to "quote" your changes, using standard
|
||||
@ -175,8 +181,11 @@ message starts, you can put a "From: " line to name that person.
|
||||
|
||||
You often want to add additional explanation about the patch,
|
||||
other than the commit message itself. Place such "cover letter"
|
||||
material between the three dash lines and the diffstat. Git-notes
|
||||
can also be inserted using the `--notes` option.
|
||||
material between the three-dash line and the diffstat. For
|
||||
patches requiring multiple iterations of review and discussion,
|
||||
an explanation of changes between each iteration can be kept in
|
||||
Git-notes and inserted automatically following the three-dash
|
||||
line via `git format-patch --notes`.
|
||||
|
||||
Do not attach the patch as a MIME attachment, compressed or not.
|
||||
Do not let your e-mail client send quoted-printable. Do not let
|
||||
@ -337,7 +346,7 @@ suggests to the contributors:
|
||||
spend their time to improve your patch. Go back to step (2).
|
||||
|
||||
(4) The list forms consensus that the last round of your patch is
|
||||
good. Send it to the list and cc the maintainer.
|
||||
good. Send it to the maintainer and cc the list.
|
||||
|
||||
(5) A topic branch is created with the patch and is merged to 'next',
|
||||
and cooked further and eventually graduates to 'master'.
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
--root::
|
||||
Do not treat root commits as boundaries. This can also be
|
||||
controlled via the `blame.showroot` config option.
|
||||
controlled via the `blame.showRoot` config option.
|
||||
|
||||
--show-stats::
|
||||
Include additional statistics at the end of blame output.
|
||||
|
||||
-L <start>,<end>::
|
||||
-L :<regex>::
|
||||
-L :<funcname>::
|
||||
Annotate only the given line range. May be specified multiple times.
|
||||
Overlapping ranges are allowed.
|
||||
+
|
||||
|
@ -38,6 +38,10 @@ sub format_one {
|
||||
}
|
||||
}
|
||||
|
||||
while (<>) {
|
||||
last if /^### command list/;
|
||||
}
|
||||
|
||||
my %cmds = ();
|
||||
for (sort <>) {
|
||||
next if /^#/;
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
diff.autorefreshindex::
|
||||
diff.autoRefreshIndex::
|
||||
When using 'git diff' to compare with work tree
|
||||
files, do not consider stat-only change as changed.
|
||||
Instead, silently run `git update-index --refresh` to
|
||||
@ -75,11 +75,11 @@ diff.ignoreSubmodules::
|
||||
commands such as 'git diff-files'. 'git checkout' also honors
|
||||
this setting when reporting uncommitted changes. Setting it to
|
||||
'all' disables the submodule summary normally shown by 'git commit'
|
||||
and 'git status' when 'status.submodulesummary' is set unless it is
|
||||
and 'git status' when 'status.submoduleSummary' is set unless it is
|
||||
overridden by using the --ignore-submodules command-line option.
|
||||
The 'git submodule' commands are not affected by this setting.
|
||||
|
||||
diff.mnemonicprefix::
|
||||
diff.mnemonicPrefix::
|
||||
If set, 'git diff' uses a prefix pair that is different from the
|
||||
standard "a/" and "b/" depending on what is being compared. When
|
||||
this configuration is in effect, reverse diff output also swaps
|
||||
@ -98,7 +98,7 @@ diff.mnemonicprefix::
|
||||
diff.noprefix::
|
||||
If set, 'git diff' does not show any source or destination prefix.
|
||||
|
||||
diff.orderfile::
|
||||
diff.orderFile::
|
||||
File indicating how to order files within a diff, using
|
||||
one shell glob pattern per line.
|
||||
Can be overridden by the '-O' option to linkgit:git-diff[1].
|
||||
@ -148,7 +148,7 @@ diff.<driver>.textconv::
|
||||
conversion is used to generate a human-readable diff. See
|
||||
linkgit:gitattributes[5] for details.
|
||||
|
||||
diff.<driver>.wordregex::
|
||||
diff.<driver>.wordRegex::
|
||||
The regular expression that the diff driver should use to
|
||||
split words in a line. See linkgit:gitattributes[5] for
|
||||
details.
|
||||
|
@ -66,7 +66,8 @@ be committed)
|
||||
|
||||
Status letters C and R are always followed by a score (denoting the
|
||||
percentage of similarity between the source and target of the move or
|
||||
copy), and are the only ones to be so.
|
||||
copy). Status letter M may be followed by a score (denoting the
|
||||
percentage of dissimilarity) for file rewrites.
|
||||
|
||||
<sha1> is shown as all 0's if a file is new on the filesystem
|
||||
and it is out of sync with the index.
|
||||
|
@ -77,7 +77,7 @@ combined diff format
|
||||
Any diff-generating command can take the `-c` or `--cc` option to
|
||||
produce a 'combined diff' when showing a merge. This is the default
|
||||
format when showing merges with linkgit:git-diff[1] or
|
||||
linkgit:git-show[1]. Note also that you can give the `-m' option to any
|
||||
linkgit:git-show[1]. Note also that you can give the `-m` option to any
|
||||
of these commands to force generation of diffs with individual parents
|
||||
of a merge.
|
||||
|
||||
|
@ -23,7 +23,9 @@ ifndef::git-format-patch[]
|
||||
-u::
|
||||
--patch::
|
||||
Generate patch (see section on generating patches).
|
||||
{git-diff? This is the default.}
|
||||
ifdef::git-diff[]
|
||||
This is the default.
|
||||
endif::git-diff[]
|
||||
endif::git-format-patch[]
|
||||
|
||||
-s::
|
||||
@ -41,8 +43,19 @@ endif::git-format-patch[]
|
||||
|
||||
ifndef::git-format-patch[]
|
||||
--raw::
|
||||
Generate the raw format.
|
||||
{git-diff-core? This is the default.}
|
||||
ifndef::git-log[]
|
||||
Generate the diff in raw format.
|
||||
ifdef::git-diff-core[]
|
||||
This is the default.
|
||||
endif::git-diff-core[]
|
||||
endif::git-log[]
|
||||
ifdef::git-log[]
|
||||
For each commit, show a summary of changes using the raw diff
|
||||
format. See the "RAW OUTPUT FORMAT" section of
|
||||
linkgit:git-diff[1]. This is different from showing the log
|
||||
itself in raw format, which you can achieve with
|
||||
`--format=raw`.
|
||||
endif::git-log[]
|
||||
endif::git-format-patch[]
|
||||
|
||||
ifndef::git-format-patch[]
|
||||
@ -278,6 +291,16 @@ ifndef::git-format-patch[]
|
||||
initial indent of the line are considered whitespace errors.
|
||||
Exits with non-zero status if problems are found. Not compatible
|
||||
with --exit-code.
|
||||
|
||||
--ws-error-highlight=<kind>::
|
||||
Highlight whitespace errors on lines specified by <kind>
|
||||
in the color specified by `color.diff.whitespace`. <kind>
|
||||
is a comma separated list of `old`, `new`, `context`. When
|
||||
this option is not given, only whitespace errors in `new`
|
||||
lines are highlighted. E.g. `--ws-error-highlight=new,old`
|
||||
highlights whitespace errors on both deleted and added lines.
|
||||
`all` can be used as a short-hand for `old,new,context`.
|
||||
|
||||
endif::git-format-patch[]
|
||||
|
||||
--full-index::
|
||||
@ -432,8 +455,8 @@ endif::git-format-patch[]
|
||||
-O<orderfile>::
|
||||
Output the patch in the order specified in the
|
||||
<orderfile>, which has one shell glob pattern per line.
|
||||
This overrides the `diff.orderfile` configuration variable
|
||||
(see linkgit:git-config[1]). To cancel `diff.orderfile`,
|
||||
This overrides the `diff.orderFile` configuration variable
|
||||
(see linkgit:git-config[1]). To cancel `diff.orderFile`,
|
||||
use `-O/dev/null`.
|
||||
|
||||
ifndef::git-format-patch[]
|
||||
|
9
Documentation/everyday.txto
Normal file
9
Documentation/everyday.txto
Normal file
@ -0,0 +1,9 @@
|
||||
Everyday Git With 20 Commands Or So
|
||||
===================================
|
||||
|
||||
This document has been moved to linkgit:giteveryday[1].
|
||||
|
||||
Please let the owners of the referring site know so that they can update the
|
||||
link you clicked to get here.
|
||||
|
||||
Thanks.
|
@ -68,7 +68,7 @@ endif::git-pull[]
|
||||
By default, tags that point at objects that are downloaded
|
||||
from the remote repository are fetched and stored locally.
|
||||
This option disables this automatic tag following. The default
|
||||
behavior for a remote may be specified with the remote.<name>.tagopt
|
||||
behavior for a remote may be specified with the remote.<name>.tagOpt
|
||||
setting. See linkgit:git-config[1].
|
||||
|
||||
ifndef::git-pull[]
|
||||
|
10
Documentation/fmt-merge-msg-config.txt
Normal file
10
Documentation/fmt-merge-msg-config.txt
Normal file
@ -0,0 +1,10 @@
|
||||
merge.branchdesc::
|
||||
In addition to branch names, populate the log message with
|
||||
the branch description text associated with them. Defaults
|
||||
to false.
|
||||
|
||||
merge.log::
|
||||
In addition to branch names, populate the log message with at
|
||||
most the specified number of one-line descriptions from the
|
||||
actual commits that are being merged. Defaults to false, and
|
||||
true is a synonym for 20.
|
@ -8,7 +8,7 @@ git-add - Add file contents to the index
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
|
||||
'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
|
||||
[--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
|
||||
[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing]
|
||||
[--] [<pathspec>...]
|
||||
@ -93,7 +93,8 @@ This effectively runs `add --interactive`, but bypasses the
|
||||
initial command menu and directly jumps to the `patch` subcommand.
|
||||
See ``Interactive mode'' for details.
|
||||
|
||||
-e, \--edit::
|
||||
-e::
|
||||
--edit::
|
||||
Open the diff vs. the index in an editor and let the user
|
||||
edit it. After the editor was closed, adjust the hunk headers
|
||||
and apply the patch to the index.
|
||||
@ -173,7 +174,7 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
|
||||
Configuration
|
||||
-------------
|
||||
|
||||
The optional configuration variable `core.excludesfile` indicates a path to a
|
||||
The optional configuration variable `core.excludesFile` indicates a path to a
|
||||
file containing patterns of file names to exclude from git-add, similar to
|
||||
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
|
||||
those in info/exclude. See linkgit:gitignore[5].
|
||||
@ -317,7 +318,7 @@ After deciding the fate for all hunks, if there is any hunk
|
||||
that was chosen, the index is updated with the selected hunks.
|
||||
+
|
||||
You can omit having to type return here, by setting the configuration
|
||||
variable `interactive.singlekey` to `true`.
|
||||
variable `interactive.singleKey` to `true`.
|
||||
|
||||
diff::
|
||||
|
||||
|
@ -10,7 +10,7 @@ SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
|
||||
[--3way] [--interactive] [--committer-date-is-author-date]
|
||||
[--[no-]3way] [--interactive] [--committer-date-is-author-date]
|
||||
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
|
||||
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
|
||||
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
|
||||
@ -52,11 +52,23 @@ OPTIONS
|
||||
-c::
|
||||
--scissors::
|
||||
Remove everything in body before a scissors line (see
|
||||
linkgit:git-mailinfo[1]).
|
||||
linkgit:git-mailinfo[1]). Can be activated by default using
|
||||
the `mailinfo.scissors` configuration variable.
|
||||
|
||||
--no-scissors::
|
||||
Ignore scissors lines (see linkgit:git-mailinfo[1]).
|
||||
|
||||
-m::
|
||||
--message-id::
|
||||
Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
|
||||
so that the Message-ID header is added to the commit message.
|
||||
The `am.messageid` configuration variable can be used to specify
|
||||
the default behaviour.
|
||||
|
||||
--no-message-id::
|
||||
Do not add the Message-ID header to the commit message.
|
||||
`no-message-id` is useful to override `am.messageid`.
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
Be quiet. Only print error messages.
|
||||
@ -78,12 +90,14 @@ default. You can use `--no-utf8` to override this.
|
||||
|
||||
-3::
|
||||
--3way::
|
||||
--no-3way::
|
||||
When the patch does not apply cleanly, fall back on
|
||||
3-way merge if the patch records the identity of blobs
|
||||
it is supposed to apply to and we have those blobs
|
||||
available locally.
|
||||
available locally. `--no-3way` can be used to override
|
||||
am.threeWay configuration variable. For more information,
|
||||
see am.threeWay in linkgit:git-config[1].
|
||||
|
||||
--ignore-date::
|
||||
--ignore-space-change::
|
||||
--ignore-whitespace::
|
||||
--whitespace=<option>::
|
||||
|
@ -16,7 +16,7 @@ SYNOPSIS
|
||||
[--ignore-space-change | --ignore-whitespace ]
|
||||
[--whitespace=(nowarn|warn|fix|error|error-all)]
|
||||
[--exclude=<path>] [--include=<path>] [--directory=<root>]
|
||||
[--verbose] [<patch>...]
|
||||
[--verbose] [--unsafe-paths] [<patch>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
@ -229,10 +229,20 @@ For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh`
|
||||
can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by
|
||||
running `git apply --directory=modules/git-gui`.
|
||||
|
||||
--unsafe-paths::
|
||||
By default, a patch that affects outside the working area
|
||||
(either a Git controlled working tree, or the current working
|
||||
directory when "git apply" is used as a replacement of GNU
|
||||
patch) is rejected as a mistake (or a mischief).
|
||||
+
|
||||
When `git apply` is used as a "better GNU patch", the user can pass
|
||||
the `--unsafe-paths` option to override this safety check. This option
|
||||
has no effect when `--index` or `--cached` is in use.
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
|
||||
apply.ignorewhitespace::
|
||||
apply.ignoreWhitespace::
|
||||
Set to 'change' if you want changes in whitespace to be ignored by default.
|
||||
Set to one of: no, none, never, false if you want changes in
|
||||
whitespace to be significant.
|
||||
|
@ -119,7 +119,7 @@ developed and maintained during years or even tens of years by a lot
|
||||
of people. And as there are often many people who depend (sometimes
|
||||
critically) on such software, regressions are a really big problem.
|
||||
|
||||
One such software is the linux kernel. And if we look at the linux
|
||||
One such software is the Linux kernel. And if we look at the Linux
|
||||
kernel, we can see that a lot of time and effort is spent to fight
|
||||
regressions. The release cycle start with a 2 weeks long merge
|
||||
window. Then the first release candidate (rc) version is tagged. And
|
||||
@ -132,7 +132,7 @@ regressions. And this time is more than 80% of the release cycle
|
||||
time. But this is not the end of the fight yet, as of course it
|
||||
continues after the release.
|
||||
|
||||
And then this is what Ingo Molnar (a well known linux kernel
|
||||
And then this is what Ingo Molnar (a well known Linux kernel
|
||||
developer) says about his use of git bisect:
|
||||
|
||||
_____________
|
||||
|
@ -3,7 +3,7 @@ git-bisect(1)
|
||||
|
||||
NAME
|
||||
----
|
||||
git-bisect - Find by binary search the change that introduced a bug
|
||||
git-bisect - Use binary search to find the commit that introduced a bug
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
@ -16,7 +16,6 @@ DESCRIPTION
|
||||
The command takes various subcommands, and different options depending
|
||||
on the subcommand:
|
||||
|
||||
git bisect help
|
||||
git bisect start [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]
|
||||
git bisect bad [<rev>]
|
||||
git bisect good [<rev>...]
|
||||
@ -26,64 +25,71 @@ on the subcommand:
|
||||
git bisect replay <logfile>
|
||||
git bisect log
|
||||
git bisect run <cmd>...
|
||||
git bisect help
|
||||
|
||||
This command uses 'git rev-list --bisect' to help drive the
|
||||
binary search process to find which change introduced a bug, given an
|
||||
old "good" commit object name and a later "bad" commit object name.
|
||||
|
||||
Getting help
|
||||
~~~~~~~~~~~~
|
||||
|
||||
Use "git bisect" to get a short usage description, and "git bisect
|
||||
help" or "git bisect -h" to get a long usage description.
|
||||
This command uses a binary search algorithm to find which commit in
|
||||
your project's history introduced a bug. You use it by first telling
|
||||
it a "bad" commit that is known to contain the bug, and a "good"
|
||||
commit that is known to be before the bug was introduced. Then `git
|
||||
bisect` picks a commit between those two endpoints and asks you
|
||||
whether the selected commit is "good" or "bad". It continues narrowing
|
||||
down the range until it finds the exact commit that introduced the
|
||||
change.
|
||||
|
||||
Basic bisect commands: start, bad, good
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Using the Linux kernel tree as an example, basic use of the bisect
|
||||
command is as follows:
|
||||
As an example, suppose you are trying to find the commit that broke a
|
||||
feature that was known to work in version `v2.6.13-rc2` of your
|
||||
project. You start a bisect session as follows:
|
||||
|
||||
------------------------------------------------
|
||||
$ git bisect start
|
||||
$ git bisect bad # Current version is bad
|
||||
$ git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version
|
||||
# tested that was good
|
||||
$ git bisect good v2.6.13-rc2 # v2.6.13-rc2 is known to be good
|
||||
------------------------------------------------
|
||||
|
||||
When you have specified at least one bad and one good version, the
|
||||
command bisects the revision tree and outputs something similar to
|
||||
the following:
|
||||
Once you have specified at least one bad and one good commit, `git
|
||||
bisect` selects a commit in the middle of that range of history,
|
||||
checks it out, and outputs something similar to the following:
|
||||
|
||||
------------------------------------------------
|
||||
Bisecting: 675 revisions left to test after this
|
||||
Bisecting: 675 revisions left to test after this (roughly 10 steps)
|
||||
------------------------------------------------
|
||||
|
||||
The state in the middle of the set of revisions is then checked out.
|
||||
You would now compile that kernel and boot it. If the booted kernel
|
||||
works correctly, you would then issue the following command:
|
||||
You should now compile the checked-out version and test it. If that
|
||||
version works correctly, type
|
||||
|
||||
------------------------------------------------
|
||||
$ git bisect good # this one is good
|
||||
$ git bisect good
|
||||
------------------------------------------------
|
||||
|
||||
The output of this command would be something similar to the following:
|
||||
If that version is broken, type
|
||||
|
||||
------------------------------------------------
|
||||
Bisecting: 337 revisions left to test after this
|
||||
$ git bisect bad
|
||||
------------------------------------------------
|
||||
|
||||
You keep repeating this process, compiling the tree, testing it, and
|
||||
depending on whether it is good or bad issuing the command "git bisect good"
|
||||
or "git bisect bad" to ask for the next bisection.
|
||||
Then `git bisect` will respond with something like
|
||||
|
||||
------------------------------------------------
|
||||
Bisecting: 337 revisions left to test after this (roughly 9 steps)
|
||||
------------------------------------------------
|
||||
|
||||
Keep repeating the process: compile the tree, test it, and depending
|
||||
on whether it is good or bad run `git bisect good` or `git bisect bad`
|
||||
to ask for the next commit that needs testing.
|
||||
|
||||
Eventually there will be no more revisions left to inspect, and the
|
||||
command will print out a description of the first bad commit. The
|
||||
reference `refs/bisect/bad` will be left pointing at that commit.
|
||||
|
||||
Eventually there will be no more revisions left to bisect, and you
|
||||
will have been left with the first bad kernel revision in "refs/bisect/bad".
|
||||
|
||||
Bisect reset
|
||||
~~~~~~~~~~~~
|
||||
|
||||
After a bisect session, to clean up the bisection state and return to
|
||||
the original HEAD (i.e., to quit bisecting), issue the following command:
|
||||
the original HEAD, issue the following command:
|
||||
|
||||
------------------------------------------------
|
||||
$ git bisect reset
|
||||
@ -100,9 +106,10 @@ instead:
|
||||
$ git bisect reset <commit>
|
||||
------------------------------------------------
|
||||
|
||||
For example, `git bisect reset HEAD` will leave you on the current
|
||||
bisection commit and avoid switching commits at all, while `git bisect
|
||||
reset bisect/bad` will check out the first bad revision.
|
||||
For example, `git bisect reset bisect/bad` will check out the first
|
||||
bad revision, while `git bisect reset HEAD` will leave you on the
|
||||
current bisection commit and avoid switching commits at all.
|
||||
|
||||
|
||||
Bisect visualize
|
||||
~~~~~~~~~~~~~~~~
|
||||
@ -147,17 +154,17 @@ $ git bisect replay that-file
|
||||
Avoiding testing a commit
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
If, in the middle of a bisect session, you know that the next suggested
|
||||
revision is not a good one to test (e.g. the change the commit
|
||||
introduces is known not to work in your environment and you know it
|
||||
does not have anything to do with the bug you are chasing), you may
|
||||
want to find a nearby commit and try that instead.
|
||||
If, in the middle of a bisect session, you know that the suggested
|
||||
revision is not a good one to test (e.g. it fails to build and you
|
||||
know that the failure does not have anything to do with the bug you
|
||||
are chasing), you can manually select a nearby commit and test that
|
||||
one instead.
|
||||
|
||||
For example:
|
||||
|
||||
------------
|
||||
$ git bisect good/bad # previous round was good or bad.
|
||||
Bisecting: 337 revisions left to test after this
|
||||
Bisecting: 337 revisions left to test after this (roughly 9 steps)
|
||||
$ git bisect visualize # oops, that is uninteresting.
|
||||
$ git reset --hard HEAD~3 # try 3 revisions before what
|
||||
# was suggested
|
||||
@ -169,18 +176,19 @@ the revision as good or bad in the usual manner.
|
||||
Bisect skip
|
||||
~~~~~~~~~~~~
|
||||
|
||||
Instead of choosing by yourself a nearby commit, you can ask Git
|
||||
to do it for you by issuing the command:
|
||||
Instead of choosing a nearby commit by yourself, you can ask Git to do
|
||||
it for you by issuing the command:
|
||||
|
||||
------------
|
||||
$ git bisect skip # Current version cannot be tested
|
||||
------------
|
||||
|
||||
But Git may eventually be unable to tell the first bad commit among
|
||||
a bad commit and one or more skipped commits.
|
||||
However, if you skip a commit adjacent to the one you are looking for,
|
||||
Git will be unable to tell exactly which of those commits was the
|
||||
first bad one.
|
||||
|
||||
You can even skip a range of commits, instead of just one commit,
|
||||
using the "'<commit1>'..'<commit2>'" notation. For example:
|
||||
You can also skip a range of commits, instead of just one commit,
|
||||
using range notation. For example:
|
||||
|
||||
------------
|
||||
$ git bisect skip v2.5..v2.6
|
||||
@ -196,8 +204,8 @@ would issue the command:
|
||||
$ git bisect skip v2.5 v2.5..v2.6
|
||||
------------
|
||||
|
||||
This tells the bisect process that the commits between `v2.5` included
|
||||
and `v2.6` included should be skipped.
|
||||
This tells the bisect process that the commits between `v2.5` and
|
||||
`v2.6` (inclusive) should be skipped.
|
||||
|
||||
|
||||
Cutting down bisection by giving more parameters to bisect start
|
||||
@ -231,14 +239,14 @@ or bad, you can bisect by issuing the command:
|
||||
$ git bisect run my_script arguments
|
||||
------------
|
||||
|
||||
Note that the script (`my_script` in the above example) should
|
||||
exit with code 0 if the current source code is good, and exit with a
|
||||
code between 1 and 127 (inclusive), except 125, if the current
|
||||
source code is bad.
|
||||
Note that the script (`my_script` in the above example) should exit
|
||||
with code 0 if the current source code is good/old, and exit with a
|
||||
code between 1 and 127 (inclusive), except 125, if the current source
|
||||
code is bad/new.
|
||||
|
||||
Any other exit code will abort the bisect process. It should be noted
|
||||
that a program that terminates via "exit(-1)" leaves $? = 255, (see the
|
||||
exit(3) manual page), as the value is chopped with "& 0377".
|
||||
that a program that terminates via `exit(-1)` leaves $? = 255, (see the
|
||||
exit(3) manual page), as the value is chopped with `& 0377`.
|
||||
|
||||
The special exit code 125 should be used when the current source code
|
||||
cannot be tested. If the script exits with this code, the current
|
||||
@ -247,7 +255,7 @@ as the highest sensible value to use for this purpose, because 126 and 127
|
||||
are used by POSIX shells to signal specific error status (127 is for
|
||||
command not found, 126 is for command found but not executable---these
|
||||
details do not matter, as they are normal errors in the script, as far as
|
||||
"bisect run" is concerned).
|
||||
`bisect run` is concerned).
|
||||
|
||||
You may often find that during a bisect session you want to have
|
||||
temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a
|
||||
@ -260,7 +268,7 @@ next revision to test, the script can apply the patch
|
||||
before compiling, run the real test, and afterwards decide if the
|
||||
revision (possibly with the needed patch) passed the test and then
|
||||
rewind the tree to the pristine state. Finally the script should exit
|
||||
with the status of the real test to let the "git bisect run" command loop
|
||||
with the status of the real test to let the `git bisect run` command loop
|
||||
determine the eventual outcome of the bisect session.
|
||||
|
||||
OPTIONS
|
||||
@ -307,12 +315,12 @@ $ git bisect run ~/test.sh
|
||||
$ git bisect reset # quit the bisect session
|
||||
------------
|
||||
+
|
||||
Here we use a "test.sh" custom script. In this script, if "make"
|
||||
Here we use a `test.sh` custom script. In this script, if `make`
|
||||
fails, we skip the current commit.
|
||||
"check_test_case.sh" should "exit 0" if the test case passes,
|
||||
and "exit 1" otherwise.
|
||||
`check_test_case.sh` should `exit 0` if the test case passes,
|
||||
and `exit 1` otherwise.
|
||||
+
|
||||
It is safer if both "test.sh" and "check_test_case.sh" are
|
||||
It is safer if both `test.sh` and `check_test_case.sh` are
|
||||
outside the repository to prevent interactions between the bisect,
|
||||
make and test processes and the scripts.
|
||||
|
||||
@ -379,6 +387,11 @@ In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit
|
||||
has at least one parent whose reachable graph is fully traversable in the sense
|
||||
required by 'git pack objects'.
|
||||
|
||||
Getting help
|
||||
~~~~~~~~~~~~
|
||||
|
||||
Use `git bisect` to get a short usage description, and `git bisect
|
||||
help` or `git bisect -h` to get a long usage description.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
|
@ -76,6 +76,8 @@ include::blame-options.txt[]
|
||||
-e::
|
||||
--show-email::
|
||||
Show the author email instead of author name (Default: off).
|
||||
This can also be controlled via the `blame.showEmail` config
|
||||
option.
|
||||
|
||||
-w::
|
||||
Ignore whitespace when comparing the parent's version and
|
||||
|
@ -51,7 +51,7 @@ When a local branch is started off a remote-tracking branch, Git sets up the
|
||||
branch (specifically the `branch.<name>.remote` and `branch.<name>.merge`
|
||||
configuration entries) so that 'git pull' will appropriately merge from
|
||||
the remote-tracking branch. This behavior may be changed via the global
|
||||
`branch.autosetupmerge` configuration flag. That setting can be
|
||||
`branch.autoSetupMerge` configuration flag. That setting can be
|
||||
overridden by using the `--track` and `--no-track` options, and
|
||||
changed later using `git branch --set-upstream-to`.
|
||||
|
||||
@ -81,7 +81,7 @@ OPTIONS
|
||||
`--track` or `--set-upstream`.
|
||||
|
||||
-D::
|
||||
Delete a branch irrespective of its merged status.
|
||||
Shortcut for `--delete --force`.
|
||||
|
||||
-l::
|
||||
--create-reflog::
|
||||
@ -95,13 +95,17 @@ OPTIONS
|
||||
--force::
|
||||
Reset <branchname> to <startpoint> if <branchname> exists
|
||||
already. Without `-f` 'git branch' refuses to change an existing branch.
|
||||
In combination with `-d` (or `--delete`), allow deleting the
|
||||
branch irrespective of its merged status. In combination with
|
||||
`-m` (or `--move`), allow renaming the branch even if the new
|
||||
branch name already exists.
|
||||
|
||||
-m::
|
||||
--move::
|
||||
Move/rename a branch and the corresponding reflog.
|
||||
|
||||
-M::
|
||||
Move/rename a branch even if the new branch name already exists.
|
||||
Shortcut for `--move --force`.
|
||||
|
||||
--color[=<when>]::
|
||||
Color branches to highlight current, local, and
|
||||
@ -166,14 +170,14 @@ This option is only applicable in non-verbose mode.
|
||||
upstream when the new branch is checked out.
|
||||
+
|
||||
This behavior is the default when the start point is a remote-tracking branch.
|
||||
Set the branch.autosetupmerge configuration variable to `false` if you
|
||||
Set the branch.autoSetupMerge configuration variable to `false` if you
|
||||
want `git checkout` and `git branch` to always behave as if '--no-track'
|
||||
were given. Set it to `always` if you want this behavior when the
|
||||
start-point is either a local or remote-tracking branch.
|
||||
|
||||
--no-track::
|
||||
Do not set up "upstream" configuration, even if the
|
||||
branch.autosetupmerge configuration variable is true.
|
||||
branch.autoSetupMerge configuration variable is true.
|
||||
|
||||
--set-upstream::
|
||||
If specified branch does not exist yet or if `--force` has been
|
||||
@ -193,7 +197,9 @@ start-point is either a local or remote-tracking branch.
|
||||
|
||||
--edit-description::
|
||||
Open an editor and edit the text to explain what the branch is
|
||||
for, to be used by various other commands (e.g. `request-pull`).
|
||||
for, to be used by various other commands (e.g. `format-patch`,
|
||||
`request-pull`, and `merge` (if enabled)). Multi-line explanations
|
||||
may be used.
|
||||
|
||||
--contains [<commit>]::
|
||||
Only list branches which contain the specified commit (HEAD
|
||||
|
@ -9,8 +9,8 @@ git-cat-file - Provide content or type and size information for repository objec
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git cat-file' (-t | -s | -e | -p | <type> | --textconv ) <object>
|
||||
'git cat-file' (--batch | --batch-check) < <list-of-objects>
|
||||
'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv ) <object>
|
||||
'git cat-file' (--batch | --batch-check) [--follow-symlinks] < <list-of-objects>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
@ -69,6 +69,79 @@ OPTIONS
|
||||
not be combined with any other options or arguments. See the
|
||||
section `BATCH OUTPUT` below for details.
|
||||
|
||||
--batch-all-objects::
|
||||
Instead of reading a list of objects on stdin, perform the
|
||||
requested batch operation on all objects in the repository and
|
||||
any alternate object stores (not just reachable objects).
|
||||
Requires `--batch` or `--batch-check` be specified. Note that
|
||||
the objects are visited in order sorted by their hashes.
|
||||
|
||||
--buffer::
|
||||
Normally batch output is flushed after each object is output, so
|
||||
that a process can interactively read and write from
|
||||
`cat-file`. With this option, the output uses normal stdio
|
||||
buffering; this is much more efficient when invoking
|
||||
`--batch-check` on a large number of objects.
|
||||
|
||||
--allow-unknown-type::
|
||||
Allow -s or -t to query broken/corrupt objects of unknown type.
|
||||
|
||||
--follow-symlinks::
|
||||
With --batch or --batch-check, follow symlinks inside the
|
||||
repository when requesting objects with extended SHA-1
|
||||
expressions of the form tree-ish:path-in-tree. Instead of
|
||||
providing output about the link itself, provide output about
|
||||
the linked-to object. If a symlink points outside the
|
||||
tree-ish (e.g. a link to /foo or a root-level link to ../foo),
|
||||
the portion of the link which is outside the tree will be
|
||||
printed.
|
||||
+
|
||||
This option does not (currently) work correctly when an object in the
|
||||
index is specified (e.g. `:link` instead of `HEAD:link`) rather than
|
||||
one in the tree.
|
||||
+
|
||||
This option cannot (currently) be used unless `--batch` or
|
||||
`--batch-check` is used.
|
||||
+
|
||||
For example, consider a git repository containing:
|
||||
+
|
||||
--
|
||||
f: a file containing "hello\n"
|
||||
link: a symlink to f
|
||||
dir/link: a symlink to ../f
|
||||
plink: a symlink to ../f
|
||||
alink: a symlink to /etc/passwd
|
||||
--
|
||||
+
|
||||
For a regular file `f`, `echo HEAD:f | git cat-file --batch` would print
|
||||
+
|
||||
--
|
||||
ce013625030ba8dba906f756967f9e9ca394464a blob 6
|
||||
--
|
||||
+
|
||||
And `echo HEAD:link | git cat-file --batch --follow-symlinks` would
|
||||
print the same thing, as would `HEAD:dir/link`, as they both point at
|
||||
`HEAD:f`.
|
||||
+
|
||||
Without `--follow-symlinks`, these would print data about the symlink
|
||||
itself. In the case of `HEAD:link`, you would see
|
||||
+
|
||||
--
|
||||
4d1ae35ba2c8ec712fa2a379db44ad639ca277bd blob 1
|
||||
--
|
||||
+
|
||||
Both `plink` and `alink` point outside the tree, so they would
|
||||
respectively print:
|
||||
+
|
||||
--
|
||||
symlink 4
|
||||
../f
|
||||
|
||||
symlink 11
|
||||
/etc/passwd
|
||||
--
|
||||
|
||||
|
||||
OUTPUT
|
||||
------
|
||||
If '-t' is specified, one of the <type>.
|
||||
@ -148,6 +221,47 @@ the repository, then `cat-file` will ignore any custom format and print:
|
||||
<object> SP missing LF
|
||||
------------
|
||||
|
||||
If --follow-symlinks is used, and a symlink in the repository points
|
||||
outside the repository, then `cat-file` will ignore any custom format
|
||||
and print:
|
||||
|
||||
------------
|
||||
symlink SP <size> LF
|
||||
<symlink> LF
|
||||
------------
|
||||
|
||||
The symlink will either be absolute (beginning with a /), or relative
|
||||
to the tree root. For instance, if dir/link points to ../../foo, then
|
||||
<symlink> will be ../foo. <size> is the size of the symlink in bytes.
|
||||
|
||||
If --follow-symlinks is used, the following error messages will be
|
||||
displayed:
|
||||
|
||||
------------
|
||||
<object> SP missing LF
|
||||
------------
|
||||
is printed when the initial symlink requested does not exist.
|
||||
|
||||
------------
|
||||
dangling SP <size> LF
|
||||
<object> LF
|
||||
------------
|
||||
is printed when the initial symlink exists, but something that
|
||||
it (transitive-of) points to does not.
|
||||
|
||||
------------
|
||||
loop SP <size> LF
|
||||
<object> LF
|
||||
------------
|
||||
is printed for symlink loops (or any symlinks that
|
||||
require more than 40 link resolutions to resolve).
|
||||
|
||||
------------
|
||||
notdir SP <size> LF
|
||||
<object> LF
|
||||
------------
|
||||
is printed when, during symlink resolution, a file is used as a
|
||||
directory name.
|
||||
|
||||
CAVEATS
|
||||
-------
|
||||
|
@ -21,6 +21,9 @@ the exclude mechanism) that decides if the pathname is excluded or
|
||||
included. Later patterns within a file take precedence over earlier
|
||||
ones.
|
||||
|
||||
By default, tracked files are not shown at all since they are not
|
||||
subject to exclude rules; but see `--no-index'.
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
-q, --quiet::
|
||||
@ -69,7 +72,7 @@ matching pattern, <source> is the pattern's source file, and <linenum>
|
||||
is the line number of the pattern within that source. If the pattern
|
||||
contained a `!` prefix or `/` suffix, it will be preserved in the
|
||||
output. <source> will be an absolute path when referring to the file
|
||||
configured by `core.excludesfile`, or relative to the repository root
|
||||
configured by `core.excludesFile`, or relative to the repository root
|
||||
when referring to `.git/info/exclude` or a per-directory exclude file.
|
||||
|
||||
If `-z` is specified, the pathnames in the output are delimited by the
|
||||
|
@ -94,8 +94,8 @@ OPTIONS
|
||||
Interpret <refname> as a reference name pattern for a refspec
|
||||
(as used with remote repositories). If this option is
|
||||
enabled, <refname> is allowed to contain a single `*`
|
||||
in place of a one full pathname component (e.g.,
|
||||
`foo/*/bar` but not `foo/bar*`).
|
||||
in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/`
|
||||
but not `foo/bar*/baz*`).
|
||||
|
||||
--normalize::
|
||||
Normalize 'refname' by removing any leading slash (`/`)
|
||||
|
@ -3,7 +3,7 @@ git-checkout(1)
|
||||
|
||||
NAME
|
||||
----
|
||||
git-checkout - Checkout a branch or paths to the working tree
|
||||
git-checkout - Switch branches or restore working tree files
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
@ -89,6 +89,10 @@ Omitting <branch> detaches HEAD at the tip of the current branch.
|
||||
(i.e. commit, tag or tree) to update the index for the given
|
||||
paths before updating the working tree.
|
||||
+
|
||||
'git checkout' with <paths> or `--patch` is used to restore modified or
|
||||
deleted paths to their original contents from the index or replace paths
|
||||
with the contents from a named <tree-ish> (most often a commit-ish).
|
||||
+
|
||||
The index may contain unmerged entries because of a previous failed merge.
|
||||
By default, if you try to check out such an entry from the index, the
|
||||
checkout operation will fail and nothing will be checked out.
|
||||
@ -116,6 +120,21 @@ entries; instead, unmerged entries are ignored.
|
||||
--theirs::
|
||||
When checking out paths from the index, check out stage #2
|
||||
('ours') or #3 ('theirs') for unmerged paths.
|
||||
+
|
||||
Note that during `git rebase` and `git pull --rebase`, 'ours' and
|
||||
'theirs' may appear swapped; `--ours` gives the version from the
|
||||
branch the changes are rebased onto, while `--theirs` gives the
|
||||
version from the branch that holds your work that is being rebased.
|
||||
+
|
||||
This is because `rebase` is used in a workflow that treats the
|
||||
history at the remote as the shared canonical one, and treats the
|
||||
work done on the branch you are rebasing as the third-party work to
|
||||
be integrated, and you are temporarily assuming the role of the
|
||||
keeper of the canonical history during the rebase. As the keeper of
|
||||
the canonical history, you need to view the history from the remote
|
||||
as `ours` (i.e. "our shared canonical history"), while what you did
|
||||
on your side branch as `theirs` (i.e. "one contributor's work on top
|
||||
of it").
|
||||
|
||||
-b <new_branch>::
|
||||
Create a new branch named <new_branch> and start it at
|
||||
@ -144,7 +163,7 @@ explicitly give a name with '-b' in such a case.
|
||||
|
||||
--no-track::
|
||||
Do not set up "upstream" configuration, even if the
|
||||
branch.autosetupmerge configuration variable is true.
|
||||
branch.autoSetupMerge configuration variable is true.
|
||||
|
||||
-l::
|
||||
Create the new branch's reflog; see linkgit:git-branch[1] for
|
||||
@ -210,7 +229,7 @@ the conflicted merge in the specified paths.
|
||||
--conflict=<style>::
|
||||
The same as --merge option above, but changes the way the
|
||||
conflicting hunks are presented, overriding the
|
||||
merge.conflictstyle configuration variable. Possible values are
|
||||
merge.conflictStyle configuration variable. Possible values are
|
||||
"merge" (default) and "diff3" (in addition to what is shown by
|
||||
"merge" style, shows the original contents).
|
||||
|
||||
@ -225,6 +244,12 @@ This means that you can use `git checkout -p` to selectively discard
|
||||
edits from your current working tree. See the ``Interactive Mode''
|
||||
section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
|
||||
|
||||
--ignore-other-worktrees::
|
||||
`git checkout` refuses when the wanted ref is already checked
|
||||
out by another worktree. This option makes it check the ref
|
||||
out anyway. In other words, the ref can be held by more than one
|
||||
worktree.
|
||||
|
||||
<branch>::
|
||||
Branch to checkout; if it refers to a branch (i.e., a name that,
|
||||
when prepended with "refs/heads/", is a valid ref), then that
|
||||
|
@ -131,7 +131,8 @@ effect to your index in a row.
|
||||
--keep-redundant-commits::
|
||||
If a commit being cherry picked duplicates a commit already in the
|
||||
current history, it will become empty. By default these
|
||||
redundant commits are ignored. This option overrides that behavior and
|
||||
redundant commits cause `cherry-pick` to stop so the user can
|
||||
examine the commit. This option overrides that behavior and
|
||||
creates an empty commit object. Implies `--allow-empty`.
|
||||
|
||||
--strategy=<strategy>::
|
||||
|
@ -34,8 +34,12 @@ OPTIONS
|
||||
-f::
|
||||
--force::
|
||||
If the Git configuration variable clean.requireForce is not set
|
||||
to false, 'git clean' will refuse to run unless given -f, -n or
|
||||
-i.
|
||||
to false, 'git clean' will refuse to delete files or directories
|
||||
unless given -f, -n or -i. Git will refuse to delete directories
|
||||
with .git sub directory or file unless a second -f
|
||||
is given. This affects also git submodules where the storage area
|
||||
of the removed submodule under .git/modules/ is not removed until
|
||||
-f is given twice.
|
||||
|
||||
-i::
|
||||
--interactive::
|
||||
@ -98,7 +102,7 @@ clean::
|
||||
filter by pattern::
|
||||
|
||||
This shows the files and directories to be deleted and issues an
|
||||
"Input ignore patterns>>" prompt. You can input space-seperated
|
||||
"Input ignore patterns>>" prompt. You can input space-separated
|
||||
patterns to exclude files and directories from deletion.
|
||||
E.g. "*.c *.h" will excludes files end with ".c" and ".h" from
|
||||
deletion. When you are satisfied with the filtered result, press
|
||||
|
@ -12,7 +12,7 @@ SYNOPSIS
|
||||
'git clone' [--template=<template_directory>]
|
||||
[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
|
||||
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
|
||||
[--separate-git-dir <git dir>]
|
||||
[--dissociate] [--separate-git-dir <git dir>]
|
||||
[--depth <depth>] [--[no-]single-branch]
|
||||
[--recursive | --recurse-submodules] [--] <repository>
|
||||
[<directory>]
|
||||
@ -98,7 +98,14 @@ objects from the source repository into a pack in the cloned repository.
|
||||
require fewer objects to be copied from the repository
|
||||
being cloned, reducing network and local storage costs.
|
||||
+
|
||||
*NOTE*: see the NOTE for the `--shared` option.
|
||||
*NOTE*: see the NOTE for the `--shared` option, and also the
|
||||
`--dissociate` option.
|
||||
|
||||
--dissociate::
|
||||
Borrow the objects from reference repositories specified
|
||||
with the `--reference` options only to reduce network
|
||||
transfer and stop borrowing from them after a clone is made
|
||||
by making necessary local copies of borrowed objects.
|
||||
|
||||
--quiet::
|
||||
-q::
|
||||
|
@ -59,7 +59,7 @@ OPTIONS
|
||||
GPG-sign commit.
|
||||
|
||||
--no-gpg-sign::
|
||||
Countermand `commit.gpgsign` configuration variable that is
|
||||
Countermand `commit.gpgSign` configuration variable that is
|
||||
set to force each and every commit to be signed.
|
||||
|
||||
|
||||
|
@ -94,7 +94,7 @@ OPTIONS
|
||||
--reset-author::
|
||||
When used with -C/-c/--amend options, or when committing after a
|
||||
a conflicting cherry-pick, declare that the authorship of the
|
||||
resulting commit now belongs of the committer. This also renews
|
||||
resulting commit now belongs to the committer. This also renews
|
||||
the author timestamp.
|
||||
|
||||
--short::
|
||||
@ -180,8 +180,8 @@ OPTIONS
|
||||
+
|
||||
--
|
||||
strip::
|
||||
Strip leading and trailing empty lines, trailing whitespace, and
|
||||
#commentary and collapse consecutive empty lines.
|
||||
Strip leading and trailing empty lines, trailing whitespace,
|
||||
commentary and collapse consecutive empty lines.
|
||||
whitespace::
|
||||
Same as `strip` except #commentary is not removed.
|
||||
verbatim::
|
||||
@ -250,9 +250,10 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
|
||||
|
||||
-o::
|
||||
--only::
|
||||
Make a commit only from the paths specified on the
|
||||
Make a commit by taking the updated working tree contents
|
||||
of the paths specified on the
|
||||
command line, disregarding any contents that have been
|
||||
staged so far. This is the default mode of operation of
|
||||
staged for other paths. This is the default mode of operation of
|
||||
'git commit' if any paths are given on the command line,
|
||||
in which case this option can be omitted.
|
||||
If this option is specified together with '--amend', then
|
||||
@ -281,8 +282,15 @@ configuration variable documented in linkgit:git-config[1].
|
||||
--verbose::
|
||||
Show unified diff between the HEAD commit and what
|
||||
would be committed at the bottom of the commit message
|
||||
template. Note that this diff output doesn't have its
|
||||
lines prefixed with '#'.
|
||||
template to help the user describe the commit by reminding
|
||||
what changes the commit has.
|
||||
Note that this diff output doesn't have its
|
||||
lines prefixed with '#'. This diff will not be a part
|
||||
of the commit message.
|
||||
+
|
||||
If specified twice, show in addition the unified diff between
|
||||
what would be committed and the worktree files, i.e. the unstaged
|
||||
changes to tracked files.
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
@ -309,7 +317,7 @@ configuration variable documented in linkgit:git-config[1].
|
||||
GPG-sign commit.
|
||||
|
||||
--no-gpg-sign::
|
||||
Countermand `commit.gpgsign` configuration variable that is
|
||||
Countermand `commit.gpgSign` configuration variable that is
|
||||
set to force each and every commit to be signed.
|
||||
|
||||
\--::
|
||||
|
@ -14,13 +14,13 @@ SYNOPSIS
|
||||
'git config' [<file-option>] [type] --replace-all name value [value_regex]
|
||||
'git config' [<file-option>] [type] [-z|--null] --get name [value_regex]
|
||||
'git config' [<file-option>] [type] [-z|--null] --get-all name [value_regex]
|
||||
'git config' [<file-option>] [type] [-z|--null] --get-regexp name_regex [value_regex]
|
||||
'git config' [<file-option>] [type] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]
|
||||
'git config' [<file-option>] [type] [-z|--null] --get-urlmatch name URL
|
||||
'git config' [<file-option>] --unset name [value_regex]
|
||||
'git config' [<file-option>] --unset-all name [value_regex]
|
||||
'git config' [<file-option>] --rename-section old_name new_name
|
||||
'git config' [<file-option>] --remove-section name
|
||||
'git config' [<file-option>] [-z|--null] -l | --list
|
||||
'git config' [<file-option>] [-z|--null] [--name-only] -l | --list
|
||||
'git config' [<file-option>] --get-color name [default]
|
||||
'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
|
||||
'git config' [<file-option>] -e | --edit
|
||||
@ -159,7 +159,7 @@ See also <<FILES>>.
|
||||
|
||||
-l::
|
||||
--list::
|
||||
List all variables set in config file.
|
||||
List all variables set in config file, along with their values.
|
||||
|
||||
--bool::
|
||||
'git config' will ensure that the output is "true" or "false"
|
||||
@ -190,6 +190,10 @@ See also <<FILES>>.
|
||||
output without getting confused e.g. by values that
|
||||
contain line breaks.
|
||||
|
||||
--name-only::
|
||||
Output only the names of config variables for `--list` or
|
||||
`--get-regexp`.
|
||||
|
||||
--get-colorbool name [stdout-is-tty]::
|
||||
|
||||
Find the color setting for `name` (e.g. `color.diff`) and output
|
||||
@ -405,7 +409,7 @@ true
|
||||
% git config --bool --get-urlmatch http.sslverify https://weak.example.com
|
||||
false
|
||||
% git config --get-urlmatch http https://weak.example.com
|
||||
http.cookiefile /tmp/cookie.txt
|
||||
http.cookieFile /tmp/cookie.txt
|
||||
http.sslverify false
|
||||
------------
|
||||
|
||||
|
@ -8,7 +8,7 @@ git-credential-cache--daemon - Temporarily store user credentials in memory
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
git credential-cache--daemon <socket>
|
||||
git credential-cache--daemon [--debug] <socket>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
@ -21,6 +21,10 @@ for `git-credential-cache` clients. Clients may store and retrieve
|
||||
credentials. Each credential is held for a timeout specified by the
|
||||
client; once no credentials are held, the daemon exits.
|
||||
|
||||
If the `--debug` option is specified, the daemon does not close its
|
||||
stderr stream, and may output extra diagnostics to it even after it has
|
||||
begun listening for clients.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
@ -29,12 +29,43 @@ linkgit:gitcredentials[7] or `EXAMPLES` below.
|
||||
OPTIONS
|
||||
-------
|
||||
|
||||
--store=<path>::
|
||||
--file=<path>::
|
||||
|
||||
Use `<path>` to store credentials. The file will have its
|
||||
Use `<path>` to lookup and store credentials. The file will have its
|
||||
filesystem permissions set to prevent other users on the system
|
||||
from reading it, but will not be encrypted or otherwise
|
||||
protected. Defaults to `~/.git-credentials`.
|
||||
protected. If not specified, credentials will be searched for from
|
||||
`~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and
|
||||
credentials will be written to `~/.git-credentials` if it exists, or
|
||||
`$XDG_CONFIG_HOME/git/credentials` if it exists and the former does
|
||||
not. See also <<FILES>>.
|
||||
|
||||
[[FILES]]
|
||||
FILES
|
||||
-----
|
||||
|
||||
If not set explicitly with '--file', there are two files where
|
||||
git-credential-store will search for credentials in order of precedence:
|
||||
|
||||
~/.git-credentials::
|
||||
User-specific credentials file.
|
||||
|
||||
$XDG_CONFIG_HOME/git/credentials::
|
||||
Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set
|
||||
or empty, `$HOME/.config/git/credentials` will be used. Any credentials
|
||||
stored in this file will not be used if `~/.git-credentials` has a
|
||||
matching credential as well. It is a good idea not to create this file
|
||||
if you sometimes use older versions of Git that do not support it.
|
||||
|
||||
For credential lookups, the files are read in the order given above, with the
|
||||
first matching credential found taking precedence over credentials found in
|
||||
files further down the list.
|
||||
|
||||
Credential storage will by default write to the first existing file in the
|
||||
list. If none of these files exist, `~/.git-credentials` will be created and
|
||||
written to.
|
||||
|
||||
When erasing credentials, matching credentials will be erased from all files.
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
|
@ -219,7 +219,7 @@ Problems related to tags:
|
||||
* Multiple tags on the same revision are not imported.
|
||||
|
||||
If you suspect that any of these issues may apply to the repository you
|
||||
want to imort, consider using cvs2git:
|
||||
want to import, consider using cvs2git:
|
||||
|
||||
* cvs2git (part of cvs2svn), `http://subversion.apache.org/`
|
||||
|
||||
|
@ -110,7 +110,7 @@ to allow writes to, for example:
|
||||
authdb = /etc/cvsserver/passwd
|
||||
|
||||
------
|
||||
The format of these files is username followed by the crypted password,
|
||||
The format of these files is username followed by the encrypted password,
|
||||
for example:
|
||||
|
||||
------
|
||||
@ -154,7 +154,7 @@ with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean
|
||||
[gitcvs]
|
||||
enabled=1
|
||||
# optional for debugging
|
||||
logfile=/path/to/logfile
|
||||
logFile=/path/to/logfile
|
||||
|
||||
------
|
||||
Note: you need to ensure each user that is going to invoke 'git-cvsserver' has
|
||||
@ -254,14 +254,14 @@ Configuring database backend
|
||||
its documentation if changing these variables, especially
|
||||
about `DBI->connect()`.
|
||||
|
||||
gitcvs.dbname::
|
||||
gitcvs.dbName::
|
||||
Database name. The exact meaning depends on the
|
||||
selected database driver, for SQLite this is a filename.
|
||||
Supports variable substitution (see below). May
|
||||
not contain semicolons (`;`).
|
||||
Default: '%Ggitcvs.%m.sqlite'
|
||||
|
||||
gitcvs.dbdriver::
|
||||
gitcvs.dbDriver::
|
||||
Used DBI driver. You can specify any available driver
|
||||
for this here, but it might not work. cvsserver is tested
|
||||
with 'DBD::SQLite', reported to work with
|
||||
@ -271,12 +271,12 @@ gitcvs.dbdriver::
|
||||
Default: 'SQLite'
|
||||
|
||||
gitcvs.dbuser::
|
||||
Database user. Only useful if setting `dbdriver`, since
|
||||
Database user. Only useful if setting `dbDriver`, since
|
||||
SQLite has no concept of database users. Supports variable
|
||||
substitution (see below).
|
||||
|
||||
gitcvs.dbpass::
|
||||
Database password. Only useful if setting `dbdriver`, since
|
||||
gitcvs.dbPass::
|
||||
Database password. Only useful if setting `dbDriver`, since
|
||||
SQLite has no concept of database passwords.
|
||||
|
||||
gitcvs.dbTableNamePrefix::
|
||||
@ -288,7 +288,7 @@ All variables can also be set per access method, see <<configaccessmethod,above>
|
||||
|
||||
Variable substitution
|
||||
^^^^^^^^^^^^^^^^^^^^^
|
||||
In `dbdriver` and `dbuser` you can use the following variables:
|
||||
In `dbDriver` and `dbUser` you can use the following variables:
|
||||
|
||||
%G::
|
||||
Git directory name
|
||||
@ -413,16 +413,16 @@ about end-of-line conversion.
|
||||
|
||||
Alternatively, if `gitcvs.usecrlfattr` config is not enabled
|
||||
or the attributes do not allow automatic detection for a filename, then
|
||||
the server uses the `gitcvs.allbinary` config for the default setting.
|
||||
If `gitcvs.allbinary` is set, then file not otherwise
|
||||
the server uses the `gitcvs.allBinary` config for the default setting.
|
||||
If `gitcvs.allBinary` is set, then file not otherwise
|
||||
specified will default to '-kb' mode. Otherwise the '-k' mode
|
||||
is left blank. But if `gitcvs.allbinary` is set to "guess", then
|
||||
is left blank. But if `gitcvs.allBinary` is set to "guess", then
|
||||
the correct '-k' mode will be guessed based on the contents of
|
||||
the file.
|
||||
|
||||
For best consistency with 'cvs', it is probably best to override the
|
||||
defaults by setting `gitcvs.usecrlfattr` to true,
|
||||
and `gitcvs.allbinary` to "guess".
|
||||
and `gitcvs.allBinary` to "guess".
|
||||
|
||||
Dependencies
|
||||
------------
|
||||
|
@ -3,13 +3,13 @@ git-describe(1)
|
||||
|
||||
NAME
|
||||
----
|
||||
git-describe - Show the most recent tag that is reachable from a commit
|
||||
git-describe - Describe a commit using the most recent tag reachable from it
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] <commit-ish>...
|
||||
'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]
|
||||
'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]
|
||||
|
||||
DESCRIPTION
|
||||
@ -27,7 +27,7 @@ see the -a and -s options to linkgit:git-tag[1].
|
||||
OPTIONS
|
||||
-------
|
||||
<commit-ish>...::
|
||||
Commit-ish object names to describe.
|
||||
Commit-ish object names to describe. Defaults to HEAD if omitted.
|
||||
|
||||
--dirty[=<mark>]::
|
||||
Describe the working tree.
|
||||
|
@ -91,6 +91,15 @@ instead. `--no-symlinks` is the default on Windows.
|
||||
the default diff tool will be read from the configured
|
||||
`diff.guitool` variable instead of `diff.tool`.
|
||||
|
||||
--[no-]trust-exit-code::
|
||||
'git-difftool' invokes a diff tool individually on each file.
|
||||
Errors reported by the diff tool are ignored by default.
|
||||
Use `--trust-exit-code` to make 'git-difftool' exit when an
|
||||
invoked diff tool returns a non-zero exit code.
|
||||
+
|
||||
'git-difftool' will forward the exit code of the invoked tool when
|
||||
'--trust-exit-code' is used.
|
||||
|
||||
See linkgit:git-diff[1] for the full list of supported options.
|
||||
|
||||
CONFIG VARIABLES
|
||||
@ -116,6 +125,11 @@ See the `--tool=<tool>` option above for more details.
|
||||
difftool.prompt::
|
||||
Prompt before each invocation of the diff tool.
|
||||
|
||||
difftool.trustExitCode::
|
||||
Exit difftool if the invoked diff tool returns a non-zero exit status.
|
||||
+
|
||||
See the `--trust-exit-code` option above for more details.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-diff[1]::
|
||||
|
@ -67,17 +67,17 @@ produced incorrect results if you gave these options.
|
||||
have been completed, or to save the marks table across
|
||||
incremental runs. As <file> is only opened and truncated
|
||||
at completion, the same path can also be safely given to
|
||||
\--import-marks.
|
||||
--import-marks.
|
||||
The file will not be written if no new object has been
|
||||
marked/exported.
|
||||
|
||||
--import-marks=<file>::
|
||||
Before processing any input, load the marks specified in
|
||||
<file>. The input file must exist, must be readable, and
|
||||
must use the same format as produced by \--export-marks.
|
||||
must use the same format as produced by --export-marks.
|
||||
+
|
||||
Any commits that have already been marked will not be exported again.
|
||||
If the backend uses a similar \--import-marks file, this allows for
|
||||
If the backend uses a similar --import-marks file, this allows for
|
||||
incremental bidirectional exporting of the repository by keeping the
|
||||
marks the same across runs.
|
||||
|
||||
@ -105,6 +105,11 @@ marks the same across runs.
|
||||
in the commit (as opposed to just listing the files which are
|
||||
different from the commit's first parent).
|
||||
|
||||
--anonymize::
|
||||
Anonymize the contents of the repository while still retaining
|
||||
the shape of the history and stored tree. See the section on
|
||||
`ANONYMIZING` below.
|
||||
|
||||
--refspec::
|
||||
Apply the specified refspec to each ref exported. Multiple of them can
|
||||
be specified.
|
||||
@ -141,6 +146,62 @@ referenced by that revision range contains the string
|
||||
'refs/heads/master'.
|
||||
|
||||
|
||||
ANONYMIZING
|
||||
-----------
|
||||
|
||||
If the `--anonymize` option is given, git will attempt to remove all
|
||||
identifying information from the repository while still retaining enough
|
||||
of the original tree and history patterns to reproduce some bugs. The
|
||||
goal is that a git bug which is found on a private repository will
|
||||
persist in the anonymized repository, and the latter can be shared with
|
||||
git developers to help solve the bug.
|
||||
|
||||
With this option, git will replace all refnames, paths, blob contents,
|
||||
commit and tag messages, names, and email addresses in the output with
|
||||
anonymized data. Two instances of the same string will be replaced
|
||||
equivalently (e.g., two commits with the same author will have the same
|
||||
anonymized author in the output, but bear no resemblance to the original
|
||||
author string). The relationship between commits, branches, and tags is
|
||||
retained, as well as the commit timestamps (but the commit messages and
|
||||
refnames bear no resemblance to the originals). The relative makeup of
|
||||
the tree is retained (e.g., if you have a root tree with 10 files and 3
|
||||
trees, so will the output), but their names and the contents of the
|
||||
files will be replaced.
|
||||
|
||||
If you think you have found a git bug, you can start by exporting an
|
||||
anonymized stream of the whole repository:
|
||||
|
||||
---------------------------------------------------
|
||||
$ git fast-export --anonymize --all >anon-stream
|
||||
---------------------------------------------------
|
||||
|
||||
Then confirm that the bug persists in a repository created from that
|
||||
stream (many bugs will not, as they really do depend on the exact
|
||||
repository contents):
|
||||
|
||||
---------------------------------------------------
|
||||
$ git init anon-repo
|
||||
$ cd anon-repo
|
||||
$ git fast-import <../anon-stream
|
||||
$ ... test your bug ...
|
||||
---------------------------------------------------
|
||||
|
||||
If the anonymized repository shows the bug, it may be worth sharing
|
||||
`anon-stream` along with a regular bug report. Note that the anonymized
|
||||
stream compresses very well, so gzipping it is encouraged. If you want
|
||||
to examine the stream to see that it does not contain any private data,
|
||||
you can peruse it directly before sending. You may also want to try:
|
||||
|
||||
---------------------------------------------------
|
||||
$ perl -pe 's/\d+/X/g' <anon-stream | sort -u | less
|
||||
---------------------------------------------------
|
||||
|
||||
which shows all of the unique lines (with numbers converted to "X", to
|
||||
collapse "User 0", "User 1", etc into "User X"). This produces a much
|
||||
smaller output, and it is usually easy to quickly confirm that there is
|
||||
no private data in the stream.
|
||||
|
||||
|
||||
Limitations
|
||||
-----------
|
||||
|
||||
@ -148,6 +209,10 @@ Since 'git fast-import' cannot tag trees, you will not be
|
||||
able to export the linux.git repository completely, as it contains
|
||||
a tag referencing a tree instead of a commit.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-fast-import[1]
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
@ -42,19 +42,19 @@ OPTIONS
|
||||
--quiet::
|
||||
Disable all non-fatal output, making fast-import silent when it
|
||||
is successful. This option disables the output shown by
|
||||
\--stats.
|
||||
--stats.
|
||||
|
||||
--stats::
|
||||
Display some basic statistics about the objects fast-import has
|
||||
created, the packfiles they were stored into, and the
|
||||
memory used by fast-import during this run. Showing this output
|
||||
is currently the default, but can be disabled with \--quiet.
|
||||
is currently the default, but can be disabled with --quiet.
|
||||
|
||||
Options for Frontends
|
||||
~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
--cat-blob-fd=<fd>::
|
||||
Write responses to `cat-blob` and `ls` queries to the
|
||||
Write responses to `get-mark`, `cat-blob`, and `ls` queries to the
|
||||
file descriptor <fd> instead of `stdout`. Allows `progress`
|
||||
output intended for the end-user to be separated from other
|
||||
output.
|
||||
@ -81,12 +81,12 @@ Locations of Marks Files
|
||||
have been completed, or to save the marks table across
|
||||
incremental runs. As <file> is only opened and truncated
|
||||
at checkpoint (or completion) the same path can also be
|
||||
safely given to \--import-marks.
|
||||
safely given to --import-marks.
|
||||
|
||||
--import-marks=<file>::
|
||||
Before processing any input, load the marks specified in
|
||||
<file>. The input file must exist, must be readable, and
|
||||
must use the same format as produced by \--export-marks.
|
||||
must use the same format as produced by --export-marks.
|
||||
Multiple options may be supplied to import more than one
|
||||
set of marks. If a mark is defined to different values,
|
||||
the last file wins.
|
||||
@ -179,8 +179,8 @@ fast-forward update, fast-import will skip updating that ref and instead
|
||||
prints a warning message. fast-import will always attempt to update all
|
||||
branch refs, and does not stop on the first failure.
|
||||
|
||||
Branch updates can be forced with \--force, but it's recommended that
|
||||
this only be used on an otherwise quiet repository. Using \--force
|
||||
Branch updates can be forced with --force, but it's recommended that
|
||||
this only be used on an otherwise quiet repository. Using --force
|
||||
is not necessary for an initial import into an empty repository.
|
||||
|
||||
|
||||
@ -231,11 +231,11 @@ Date Formats
|
||||
~~~~~~~~~~~~
|
||||
The following date formats are supported. A frontend should select
|
||||
the format it will use for this import by passing the format name
|
||||
in the \--date-format=<fmt> command-line option.
|
||||
in the --date-format=<fmt> command-line option.
|
||||
|
||||
`raw`::
|
||||
This is the Git native format and is `<time> SP <offutc>`.
|
||||
It is also fast-import's default format, if \--date-format was
|
||||
It is also fast-import's default format, if --date-format was
|
||||
not specified.
|
||||
+
|
||||
The time of the event is specified by `<time>` as the number of
|
||||
@ -350,6 +350,11 @@ and control the current import process. More detailed discussion
|
||||
unless the `done` feature was requested using the
|
||||
`--done` command-line option or `feature done` command.
|
||||
|
||||
`get-mark`::
|
||||
Causes fast-import to print the SHA-1 corresponding to a mark
|
||||
to the file descriptor set with `--cat-blob-fd`, or `stdout` if
|
||||
unspecified.
|
||||
|
||||
`cat-blob`::
|
||||
Causes fast-import to print a blob in 'cat-file --batch'
|
||||
format to the file descriptor set with `--cat-blob-fd` or
|
||||
@ -437,7 +442,7 @@ the email address from the other fields in the line. Note that
|
||||
of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded.
|
||||
|
||||
The time of the change is specified by `<when>` using the date format
|
||||
that was selected by the \--date-format=<fmt> command-line option.
|
||||
that was selected by the --date-format=<fmt> command-line option.
|
||||
See ``Date Formats'' above for the set of supported formats, and
|
||||
their syntax.
|
||||
|
||||
@ -507,10 +512,6 @@ omitted when creating a new branch, the first `merge` commit will be
|
||||
the first ancestor of the current commit, and the branch will start
|
||||
out with no files. An unlimited number of `merge` commands per
|
||||
commit are permitted by fast-import, thereby establishing an n-way merge.
|
||||
However Git's other tools never create commits with more than 15
|
||||
additional ancestors (forming a 16-way merge). For this reason
|
||||
it is suggested that frontends do not use more than 15 `merge`
|
||||
commands per commit; 16, if starting a new, empty branch.
|
||||
|
||||
Here `<commit-ish>` is any of the commit specification expressions
|
||||
also accepted by `from` (see above).
|
||||
@ -604,7 +605,7 @@ be removed from the branch.
|
||||
See `filemodify` above for a detailed description of `<path>`.
|
||||
|
||||
`filecopy`
|
||||
^^^^^^^^^^^^
|
||||
^^^^^^^^^^
|
||||
Recursively copies an existing file or subdirectory to a different
|
||||
location within the branch. The existing file or directory must
|
||||
exist. If the destination exists it will be completely replaced
|
||||
@ -892,7 +893,7 @@ save out all current branch refs, tags and marks.
|
||||
....
|
||||
|
||||
Note that fast-import automatically switches packfiles when the current
|
||||
packfile reaches \--max-pack-size, or 4 GiB, whichever limit is
|
||||
packfile reaches --max-pack-size, or 4 GiB, whichever limit is
|
||||
smaller. During an automatic packfile switch fast-import does not update
|
||||
the branch refs, tags or marks.
|
||||
|
||||
@ -934,6 +935,25 @@ Placing a `progress` command immediately after a `checkpoint` will
|
||||
inform the reader when the `checkpoint` has been completed and it
|
||||
can safely access the refs that fast-import updated.
|
||||
|
||||
`get-mark`
|
||||
~~~~~~~~~~
|
||||
Causes fast-import to print the SHA-1 corresponding to a mark to
|
||||
stdout or to the file descriptor previously arranged with the
|
||||
`--cat-blob-fd` argument. The command otherwise has no impact on the
|
||||
current import; its purpose is to retrieve SHA-1s that later commits
|
||||
might want to refer to in their commit messages.
|
||||
|
||||
....
|
||||
'get-mark' SP ':' <idnum> LF
|
||||
....
|
||||
|
||||
This command can be used anywhere in the stream that comments are
|
||||
accepted. In particular, the `get-mark` command can be used in the
|
||||
middle of a commit but not in the middle of a `data` command.
|
||||
|
||||
See ``Responses To Commands'' below for details about how to read
|
||||
this output safely.
|
||||
|
||||
`cat-blob`
|
||||
~~~~~~~~~~
|
||||
Causes fast-import to print a blob to a file descriptor previously
|
||||
@ -1004,7 +1024,8 @@ Output uses the same format as `git ls-tree <tree> -- <path>`:
|
||||
====
|
||||
|
||||
The <dataref> represents the blob, tree, or commit object at <path>
|
||||
and can be used in later 'cat-blob', 'filemodify', or 'ls' commands.
|
||||
and can be used in later 'get-mark', 'cat-blob', 'filemodify', or
|
||||
'ls' commands.
|
||||
|
||||
If there is no file or subtree at that path, 'git fast-import' will
|
||||
instead report
|
||||
@ -1046,9 +1067,11 @@ import-marks-if-exists::
|
||||
"feature import-marks-if-exists" like a corresponding
|
||||
command-line option silently skips a nonexistent file.
|
||||
|
||||
get-mark::
|
||||
cat-blob::
|
||||
ls::
|
||||
Require that the backend support the 'cat-blob' or 'ls' command.
|
||||
Require that the backend support the 'get-mark', 'cat-blob',
|
||||
or 'ls' command respectively.
|
||||
Versions of fast-import not supporting the specified command
|
||||
will exit with a message indicating so.
|
||||
This lets the import error out early with a clear message,
|
||||
@ -1128,11 +1151,11 @@ bidirectional pipes:
|
||||
git fast-import >fast-import-output
|
||||
====
|
||||
|
||||
A frontend set up this way can use `progress`, `ls`, and `cat-blob`
|
||||
commands to read information from the import in progress.
|
||||
A frontend set up this way can use `progress`, `get-mark`, `ls`, and
|
||||
`cat-blob` commands to read information from the import in progress.
|
||||
|
||||
To avoid deadlock, such frontends must completely consume any
|
||||
pending output from `progress`, `ls`, and `cat-blob` before
|
||||
pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before
|
||||
performing writes to fast-import that might block.
|
||||
|
||||
Crash Reports
|
||||
@ -1230,7 +1253,7 @@ users of fast-import, and are offered here as suggestions.
|
||||
Use One Mark Per Commit
|
||||
~~~~~~~~~~~~~~~~~~~~~~~
|
||||
When doing a repository conversion, use a unique mark per commit
|
||||
(`mark :<n>`) and supply the \--export-marks option on the command
|
||||
(`mark :<n>`) and supply the --export-marks option on the command
|
||||
line. fast-import will dump a file which lists every mark and the Git
|
||||
object SHA-1 that corresponds to it. If the frontend can tie
|
||||
the marks back to the source repository, it is easy to verify the
|
||||
@ -1295,7 +1318,7 @@ even for considerably large projects (100,000+ commits).
|
||||
|
||||
However repacking the repository is necessary to improve data
|
||||
locality and access performance. It can also take hours on extremely
|
||||
large projects (especially if -f and a large \--window parameter is
|
||||
large projects (especially if -f and a large --window parameter is
|
||||
used). Since repacking is safe to run alongside readers and writers,
|
||||
run the repack in the background and let it finish when it finishes.
|
||||
There is no reason to wait to explore your new Git project!
|
||||
@ -1309,7 +1332,7 @@ Repacking Historical Data
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
If you are repacking very old imported data (e.g. older than the
|
||||
last year), consider expending some extra CPU time and supplying
|
||||
\--window=50 (or higher) when you run 'git repack'.
|
||||
--window=50 (or higher) when you run 'git repack'.
|
||||
This will take longer, but will also produce a smaller packfile.
|
||||
You only need to expend the effort once, and everyone using your
|
||||
project will benefit from the smaller repository.
|
||||
@ -1411,7 +1434,7 @@ branch, their in-memory storage size can grow to a considerable size
|
||||
fast-import automatically moves active branches to inactive status based on
|
||||
a simple least-recently-used algorithm. The LRU chain is updated on
|
||||
each `commit` command. The maximum number of active branches can be
|
||||
increased or decreased on the command line with \--active-branches=.
|
||||
increased or decreased on the command line with --active-branches=.
|
||||
|
||||
per active tree
|
||||
~~~~~~~~~~~~~~~
|
||||
@ -1441,6 +1464,10 @@ operator can use this facility to peek at the objects and refs from an
|
||||
import in progress, at the cost of some added running time and worse
|
||||
compression.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-fast-export[1]
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
|
@ -80,7 +80,7 @@ be in a separate packet, and the list must end with a flush packet.
|
||||
the things up in .bash_profile).
|
||||
|
||||
--exec=<git-upload-pack>::
|
||||
Same as \--upload-pack=<git-upload-pack>.
|
||||
Same as --upload-pack=<git-upload-pack>.
|
||||
|
||||
--depth=<n>::
|
||||
Limit fetching to ancestor-chains not longer than n.
|
||||
|
@ -26,7 +26,7 @@ By default, any tag that points into the histories being fetched is
|
||||
also fetched; the effect is to fetch tags that
|
||||
point at branches that you are interested in. This default behavior
|
||||
can be changed by using the --tags or --no-tags options or by
|
||||
configuring remote.<name>.tagopt. By using a refspec that fetches tags
|
||||
configuring remote.<name>.tagOpt. By using a refspec that fetches tags
|
||||
explicitly, you can fetch tags that do not point into branches you
|
||||
are interested in as well.
|
||||
|
||||
|
@ -451,8 +451,8 @@ characteristics:
|
||||
|
||||
* By default The BFG takes full advantage of multi-core machines,
|
||||
cleansing commit file-trees in parallel. git-filter-branch cleans
|
||||
commits sequentially (ie in a single-threaded manner), though it
|
||||
_is_ possible to write filters that include their own parallellism,
|
||||
commits sequentially (i.e. in a single-threaded manner), though it
|
||||
_is_ possible to write filters that include their own parallelism,
|
||||
in the scripts executed against each commit.
|
||||
|
||||
* The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options]
|
||||
|
@ -51,17 +51,7 @@ OPTIONS
|
||||
|
||||
CONFIGURATION
|
||||
-------------
|
||||
|
||||
merge.branchdesc::
|
||||
In addition to branch names, populate the log message with
|
||||
the branch description text associated with them. Defaults
|
||||
to false.
|
||||
|
||||
merge.log::
|
||||
In addition to branch names, populate the log message with at
|
||||
most the specified number of one-line descriptions from the
|
||||
actual commits that are being merged. Defaults to false, and
|
||||
true is a synonym for 20.
|
||||
include::fmt-merge-msg-config.txt[]
|
||||
|
||||
merge.summary::
|
||||
Synonym to `merge.log`; this is deprecated and will be removed in
|
||||
|
@ -97,6 +97,12 @@ upstream::
|
||||
or "=" (in sync). Has no effect if the ref does not have
|
||||
tracking information associated with it.
|
||||
|
||||
push::
|
||||
The name of a local ref which represents the `@{push}` location
|
||||
for the displayed ref. Respects `:short`, `:track`, and
|
||||
`:trackshort` options as `upstream` does. Produces an empty
|
||||
string if no `@{push}` ref is configured.
|
||||
|
||||
HEAD::
|
||||
'*' if HEAD matches current ref (the checked out branch), ' '
|
||||
otherwise.
|
||||
|
@ -170,7 +170,7 @@ will want to ensure that threading is disabled for `git send-email`.
|
||||
-v <n>::
|
||||
--reroll-count=<n>::
|
||||
Mark the series as the <n>-th iteration of the topic. The
|
||||
output filenames have `v<n>` pretended to them, and the
|
||||
output filenames have `v<n>` prepended to them, and the
|
||||
subject prefix ("PATCH" by default, but configurable via the
|
||||
`--subject-prefix` option) has ` v<n>` appended to it. E.g.
|
||||
`--reroll-count=4` may produce `v4-0001-add-makefile.patch`
|
||||
@ -213,7 +213,7 @@ feeding the result to `git send-email`.
|
||||
|
||||
--[no-]cover-letter::
|
||||
In addition to the patches, generate a cover letter file
|
||||
containing the shortlog and the overall diffstat. You can
|
||||
containing the branch description, shortlog and the overall diffstat. You can
|
||||
fill in a description in the file before sending it out.
|
||||
|
||||
--notes[=<ref>]::
|
||||
@ -273,13 +273,13 @@ attachments, and sign off patches with configuration variables.
|
||||
------------
|
||||
[format]
|
||||
headers = "Organization: git-foo\n"
|
||||
subjectprefix = CHANGE
|
||||
subjectPrefix = CHANGE
|
||||
suffix = .txt
|
||||
numbered = auto
|
||||
to = <email>
|
||||
cc = <email>
|
||||
attach [ = mime-boundary-string ]
|
||||
signoff = true
|
||||
signOff = true
|
||||
coverletter = auto
|
||||
------------
|
||||
|
||||
|
@ -11,7 +11,7 @@ SYNOPSIS
|
||||
[verse]
|
||||
'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
|
||||
[--[no-]full] [--strict] [--verbose] [--lost-found]
|
||||
[--[no-]dangling] [--[no-]progress] [<object>*]
|
||||
[--[no-]dangling] [--[no-]progress] [--connectivity-only] [<object>*]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
@ -60,6 +60,11 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
|
||||
object pools. This is now default; you can turn it off
|
||||
with --no-full.
|
||||
|
||||
--connectivity-only::
|
||||
Check only the connectivity of tags, commits and tree objects. By
|
||||
avoiding to unpack blobs, this speeds up the operation, at the
|
||||
expense of missing corrupt objects or other problematic issues.
|
||||
|
||||
--strict::
|
||||
Enable more strict checking, namely to catch a file mode
|
||||
recorded with g+w bit set, which was created by older
|
||||
|
@ -54,10 +54,10 @@ all loose objects are combined into a single pack using
|
||||
`git repack -d -l`. Setting the value of `gc.auto` to 0
|
||||
disables automatic packing of loose objects.
|
||||
+
|
||||
If the number of packs exceeds the value of `gc.autopacklimit`,
|
||||
If the number of packs exceeds the value of `gc.autoPackLimit`,
|
||||
then existing packs (except those marked with a `.keep` file)
|
||||
are consolidated into a single pack by using the `-A` option of
|
||||
'git repack'. Setting `gc.autopacklimit` to 0 disables
|
||||
'git repack'. Setting `gc.autoPackLimit` to 0 disables
|
||||
automatic consolidation of packs.
|
||||
|
||||
--prune=<date>::
|
||||
@ -101,18 +101,18 @@ branches:
|
||||
------------
|
||||
[gc "refs/remotes/*"]
|
||||
reflogExpire = never
|
||||
reflogexpireUnreachable = 3 days
|
||||
reflogExpireUnreachable = 3 days
|
||||
------------
|
||||
|
||||
The optional configuration variable 'gc.rerereresolved' indicates
|
||||
The optional configuration variable 'gc.rerereResolved' indicates
|
||||
how long records of conflicted merge you resolved earlier are
|
||||
kept. This defaults to 60 days.
|
||||
|
||||
The optional configuration variable 'gc.rerereunresolved' indicates
|
||||
The optional configuration variable 'gc.rerereUnresolved' indicates
|
||||
how long records of conflicted merge you have not resolved are
|
||||
kept. This defaults to 15 days.
|
||||
|
||||
The optional configuration variable 'gc.packrefs' determines if
|
||||
The optional configuration variable 'gc.packRefs' determines if
|
||||
'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable
|
||||
it within all non-bare repos or it can be set to a boolean value.
|
||||
This defaults to true.
|
||||
|
@ -9,7 +9,7 @@ git-hash-object - Compute object ID and optionally creates a blob from a file
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>...
|
||||
'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...
|
||||
'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters] < <list-of-paths>
|
||||
|
||||
DESCRIPTION
|
||||
@ -51,7 +51,13 @@ OPTIONS
|
||||
Hash the contents as is, ignoring any input filter that would
|
||||
have been chosen by the attributes mechanism, including the end-of-line
|
||||
conversion. If the file is read from standard input then this
|
||||
is always implied, unless the --path option is given.
|
||||
is always implied, unless the `--path` option is given.
|
||||
|
||||
--literally::
|
||||
Allow `--stdin` to hash any garbage into a loose object which might not
|
||||
otherwise pass standard object parsing or git-fsck checks. Useful for
|
||||
stress-testing Git itself or reproducing characteristics of corrupt or
|
||||
bogus objects encountered in the wild.
|
||||
|
||||
GIT
|
||||
---
|
||||
|
@ -65,8 +65,8 @@ automatically by the web server.
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
All of the following examples map 'http://$hostname/git/foo/bar.git'
|
||||
to '/var/www/git/foo/bar.git'.
|
||||
All of the following examples map `http://$hostname/git/foo/bar.git`
|
||||
to `/var/www/git/foo/bar.git`.
|
||||
|
||||
Apache 2.x::
|
||||
Ensure mod_cgi, mod_alias, and mod_env are enabled, set
|
||||
@ -255,6 +255,15 @@ The GIT_HTTP_EXPORT_ALL environmental variable may be passed to
|
||||
'git-http-backend' to bypass the check for the "git-daemon-export-ok"
|
||||
file in each repository before allowing export of that repository.
|
||||
|
||||
The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the
|
||||
`http.maxRequestBuffer` config variable) may be set to change the
|
||||
largest ref negotiation request that git will handle during a fetch; any
|
||||
fetch requiring a larger buffer will not succeed. This value should not
|
||||
normally need to be changed, but may be helpful if you are fetching from
|
||||
a repository with an extremely large number of refs. The value can be
|
||||
specified with a unit (e.g., `100M` for 100 megabytes). The default is
|
||||
10 megabytes.
|
||||
|
||||
The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and
|
||||
GIT_COMMITTER_EMAIL to '$\{REMOTE_USER}@http.$\{REMOTE_ADDR\}',
|
||||
ensuring that any reflogs created by 'git-receive-pack' contain some
|
||||
|
@ -9,7 +9,7 @@ git-imap-send - Send a collection of patches from stdin to an IMAP folder
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git imap-send'
|
||||
'git imap-send' [-v] [-q] [--[no-]curl]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
@ -26,6 +26,28 @@ Typical usage is something like:
|
||||
git format-patch --signoff --stdout --attach origin | git imap-send
|
||||
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
||||
-v::
|
||||
--verbose::
|
||||
Be verbose.
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
Be quiet.
|
||||
|
||||
--curl::
|
||||
Use libcurl to communicate with the IMAP server, unless tunneling
|
||||
into it. Ignored if Git was built without the USE_CURL_FOR_IMAP_SEND
|
||||
option set.
|
||||
|
||||
--no-curl::
|
||||
Talk to the IMAP server using git's own IMAP routines instead of
|
||||
using libcurl. Ignored if Git was built with the NO_OPENSSL option
|
||||
set.
|
||||
|
||||
|
||||
CONFIGURATION
|
||||
-------------
|
||||
|
||||
@ -38,18 +60,17 @@ Variables
|
||||
imap.folder::
|
||||
The folder to drop the mails into, which is typically the Drafts
|
||||
folder. For example: "INBOX.Drafts", "INBOX/Drafts" or
|
||||
"[Gmail]/Drafts". Required to use imap-send.
|
||||
"[Gmail]/Drafts". Required.
|
||||
|
||||
imap.tunnel::
|
||||
Command used to setup a tunnel to the IMAP server through which
|
||||
commands will be piped instead of using a direct network connection
|
||||
to the server. Required when imap.host is not set to use imap-send.
|
||||
to the server. Required when imap.host is not set.
|
||||
|
||||
imap.host::
|
||||
A URL identifying the server. Use a `imap://` prefix for non-secure
|
||||
connections and a `imaps://` prefix for secure connections.
|
||||
Ignored when imap.tunnel is set, but required to use imap-send
|
||||
otherwise.
|
||||
Ignored when imap.tunnel is set, but required otherwise.
|
||||
|
||||
imap.user::
|
||||
The username to use when logging in to the server.
|
||||
@ -76,7 +97,10 @@ imap.preformattedHTML::
|
||||
|
||||
imap.authMethod::
|
||||
Specify authenticate method for authentication with IMAP server.
|
||||
Current supported method is 'CRAM-MD5' only.
|
||||
If Git was built with the NO_CURL option, or if your curl version is older
|
||||
than 7.34.0, or if you're running git-imap-send with the `--no-curl`
|
||||
option, the only supported method is 'CRAM-MD5'. If this is not set
|
||||
then 'git imap-send' uses the basic IMAP plaintext LOGIN command.
|
||||
|
||||
Examples
|
||||
~~~~~~~~
|
||||
@ -97,7 +121,7 @@ Using direct mode:
|
||||
host = imap://imap.example.com
|
||||
user = bob
|
||||
pass = p4ssw0rd
|
||||
..........................
|
||||
.........................
|
||||
|
||||
Using direct mode with SSL:
|
||||
|
||||
@ -109,7 +133,7 @@ Using direct mode with SSL:
|
||||
pass = p4ssw0rd
|
||||
port = 123
|
||||
sslverify = false
|
||||
..........................
|
||||
.........................
|
||||
|
||||
|
||||
EXAMPLE
|
||||
|
@ -43,7 +43,7 @@ OPTIONS
|
||||
-q::
|
||||
--quiet::
|
||||
|
||||
Only print error and warning messages, all other output will be suppressed.
|
||||
Only print error and warning messages; all other output will be suppressed.
|
||||
|
||||
--bare::
|
||||
|
||||
@ -57,12 +57,12 @@ DIRECTORY" section below.)
|
||||
|
||||
--separate-git-dir=<git dir>::
|
||||
|
||||
Instead of initializing the repository where it is supposed to be,
|
||||
place a filesytem-agnostic Git symbolic link there, pointing to the
|
||||
specified path, and initialize a Git repository at the path. The
|
||||
result is Git repository can be separated from working tree. If this
|
||||
is reinitialization, the repository will be moved to the specified
|
||||
path.
|
||||
Instead of initializing the repository as a directory to either `$GIT_DIR` or
|
||||
`./.git/`, create a text file there containing the path to the actual
|
||||
repository. This file acts as filesystem-agnostic Git symbolic link to the
|
||||
repository.
|
||||
+
|
||||
If this is reinitialization, the repository will be moved to the specified path.
|
||||
|
||||
--shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
|
||||
|
||||
@ -72,60 +72,65 @@ repository. When specified, the config variable "core.sharedRepository" is
|
||||
set so that files and directories under `$GIT_DIR` are created with the
|
||||
requested permissions. When not specified, Git will use permissions reported
|
||||
by umask(2).
|
||||
|
||||
+
|
||||
The option can have the following values, defaulting to 'group' if no value
|
||||
is given:
|
||||
+
|
||||
--
|
||||
'umask' (or 'false')::
|
||||
|
||||
- 'umask' (or 'false'): Use permissions reported by umask(2). The default,
|
||||
when `--shared` is not specified.
|
||||
Use permissions reported by umask(2). The default, when `--shared` is not
|
||||
specified.
|
||||
|
||||
- 'group' (or 'true'): Make the repository group-writable, (and g+sx, since
|
||||
the git group may be not the primary group of all users).
|
||||
This is used to loosen the permissions of an otherwise safe umask(2) value.
|
||||
Note that the umask still applies to the other permission bits (e.g. if
|
||||
umask is '0022', using 'group' will not remove read privileges from other
|
||||
(non-group) users). See '0xxx' for how to exactly specify the repository
|
||||
permissions.
|
||||
'group' (or 'true')::
|
||||
|
||||
- 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository
|
||||
readable by all users.
|
||||
Make the repository group-writable, (and g+sx, since the git group may be not
|
||||
the primary group of all users). This is used to loosen the permissions of an
|
||||
otherwise safe umask(2) value. Note that the umask still applies to the other
|
||||
permission bits (e.g. if umask is '0022', using 'group' will not remove read
|
||||
privileges from other (non-group) users). See '0xxx' for how to exactly specify
|
||||
the repository permissions.
|
||||
|
||||
- '0xxx': '0xxx' is an octal number and each file will have mode '0xxx'.
|
||||
'0xxx' will override users' umask(2) value (and not only loosen permissions
|
||||
as 'group' and 'all' does). '0640' will create a repository which is
|
||||
group-readable, but not group-writable or accessible to others. '0660' will
|
||||
create a repo that is readable and writable to the current user and group,
|
||||
but inaccessible to others.
|
||||
'all' (or 'world' or 'everybody')::
|
||||
|
||||
By default, the configuration flag receive.denyNonFastForwards is enabled
|
||||
Same as 'group', but make the repository readable by all users.
|
||||
|
||||
'0xxx'::
|
||||
|
||||
'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will
|
||||
override users' umask(2) value (and not only loosen permissions as 'group' and
|
||||
'all' does). '0640' will create a repository which is group-readable, but not
|
||||
group-writable or accessible to others. '0660' will create a repo that is
|
||||
readable and writable to the current user and group, but inaccessible to others.
|
||||
--
|
||||
|
||||
By default, the configuration flag `receive.denyNonFastForwards` is enabled
|
||||
in shared repositories, so that you cannot force a non fast-forwarding push
|
||||
into it.
|
||||
|
||||
If you name a (possibly non-existent) directory at the end of the command
|
||||
line, the command is run inside the directory (possibly after creating it).
|
||||
If you provide a 'directory', the command is run inside it. If this directory
|
||||
does not exist, it will be created.
|
||||
|
||||
--
|
||||
|
||||
|
||||
TEMPLATE DIRECTORY
|
||||
------------------
|
||||
|
||||
The template directory contains files and directories that will be copied to
|
||||
the `$GIT_DIR` after it is created.
|
||||
|
||||
The template directory used will (in order):
|
||||
The template directory will be one of the following (in order):
|
||||
|
||||
- The argument given with the `--template` option.
|
||||
- the argument given with the `--template` option;
|
||||
|
||||
- The contents of the `$GIT_TEMPLATE_DIR` environment variable.
|
||||
- the contents of the `$GIT_TEMPLATE_DIR` environment variable;
|
||||
|
||||
- The `init.templatedir` configuration variable.
|
||||
- the `init.templateDir` configuration variable; or
|
||||
|
||||
- The default template directory: `/usr/share/git-core/templates`.
|
||||
- the default template directory: `/usr/share/git-core/templates`.
|
||||
|
||||
The default template directory includes some directory structure, some
|
||||
suggested "exclude patterns", and copies of sample "hook" files.
|
||||
The suggested patterns and hook files are all modifiable and extensible.
|
||||
The default template directory includes some directory structure, suggested
|
||||
"exclude patterns" (see linkgit:gitignore[5]), and sample hook files (see linkgit:githooks[5]).
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
@ -136,10 +141,12 @@ Start a new Git repository for an existing code base::
|
||||
$ cd /path/to/my/codebase
|
||||
$ git init <1>
|
||||
$ git add . <2>
|
||||
$ git commit <3>
|
||||
----------------
|
||||
+
|
||||
<1> prepare /path/to/my/codebase/.git directory
|
||||
<2> add all existing file to the index
|
||||
<1> Create a /path/to/my/codebase/.git directory.
|
||||
<2> Add all existing files to the index.
|
||||
<3> Record the pristine state as the first commit in the history.
|
||||
|
||||
GIT
|
||||
---
|
||||
|
@ -76,7 +76,7 @@ You may specify configuration in your .git/config
|
||||
httpd = apache2 -f
|
||||
port = 4321
|
||||
browser = konqueror
|
||||
modulepath = /usr/lib/apache2/modules
|
||||
modulePath = /usr/lib/apache2/modules
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
|
314
Documentation/git-interpret-trailers.txt
Normal file
314
Documentation/git-interpret-trailers.txt
Normal file
@ -0,0 +1,314 @@
|
||||
git-interpret-trailers(1)
|
||||
=========================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-interpret-trailers - help add structured information into commit messages
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git interpret-trailers' [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Help adding 'trailers' lines, that look similar to RFC 822 e-mail
|
||||
headers, at the end of the otherwise free-form part of a commit
|
||||
message.
|
||||
|
||||
This command reads some patches or commit messages from either the
|
||||
<file> arguments or the standard input if no <file> is specified. Then
|
||||
this command applies the arguments passed using the `--trailer`
|
||||
option, if any, to the commit message part of each input file. The
|
||||
result is emitted on the standard output.
|
||||
|
||||
Some configuration variables control the way the `--trailer` arguments
|
||||
are applied to each commit message and the way any existing trailer in
|
||||
the commit message is changed. They also make it possible to
|
||||
automatically add some trailers.
|
||||
|
||||
By default, a '<token>=<value>' or '<token>:<value>' argument given
|
||||
using `--trailer` will be appended after the existing trailers only if
|
||||
the last trailer has a different (<token>, <value>) pair (or if there
|
||||
is no existing trailer). The <token> and <value> parts will be trimmed
|
||||
to remove starting and trailing whitespace, and the resulting trimmed
|
||||
<token> and <value> will appear in the message like this:
|
||||
|
||||
------------------------------------------------
|
||||
token: value
|
||||
------------------------------------------------
|
||||
|
||||
This means that the trimmed <token> and <value> will be separated by
|
||||
`': '` (one colon followed by one space).
|
||||
|
||||
By default the new trailer will appear at the end of all the existing
|
||||
trailers. If there is no existing trailer, the new trailer will appear
|
||||
after the commit message part of the output, and, if there is no line
|
||||
with only spaces at the end of the commit message part, one blank line
|
||||
will be added before the new trailer.
|
||||
|
||||
Existing trailers are extracted from the input message by looking for
|
||||
a group of one or more lines that contain a colon (by default), where
|
||||
the group is preceded by one or more empty (or whitespace-only) lines.
|
||||
The group must either be at the end of the message or be the last
|
||||
non-whitespace lines before a line that starts with '---'. Such three
|
||||
minus signs start the patch part of the message.
|
||||
|
||||
When reading trailers, there can be whitespaces before and after the
|
||||
token, the separator and the value. There can also be whitespaces
|
||||
inside the token and the value.
|
||||
|
||||
Note that 'trailers' do not follow and are not intended to follow many
|
||||
rules for RFC 822 headers. For example they do not follow the line
|
||||
folding rules, the encoding rules and probably many other rules.
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
--trim-empty::
|
||||
If the <value> part of any trailer contains only whitespace,
|
||||
the whole trailer will be removed from the resulting message.
|
||||
This apply to existing trailers as well as new trailers.
|
||||
|
||||
--trailer <token>[(=|:)<value>]::
|
||||
Specify a (<token>, <value>) pair that should be applied as a
|
||||
trailer to the input messages. See the description of this
|
||||
command.
|
||||
|
||||
CONFIGURATION VARIABLES
|
||||
-----------------------
|
||||
|
||||
trailer.separators::
|
||||
This option tells which characters are recognized as trailer
|
||||
separators. By default only ':' is recognized as a trailer
|
||||
separator, except that '=' is always accepted on the command
|
||||
line for compatibility with other git commands.
|
||||
+
|
||||
The first character given by this option will be the default character
|
||||
used when another separator is not specified in the config for this
|
||||
trailer.
|
||||
+
|
||||
For example, if the value for this option is "%=$", then only lines
|
||||
using the format '<token><sep><value>' with <sep> containing '%', '='
|
||||
or '$' and then spaces will be considered trailers. And '%' will be
|
||||
the default separator used, so by default trailers will appear like:
|
||||
'<token>% <value>' (one percent sign and one space will appear between
|
||||
the token and the value).
|
||||
|
||||
trailer.where::
|
||||
This option tells where a new trailer will be added.
|
||||
+
|
||||
This can be `end`, which is the default, `start`, `after` or `before`.
|
||||
+
|
||||
If it is `end`, then each new trailer will appear at the end of the
|
||||
existing trailers.
|
||||
+
|
||||
If it is `start`, then each new trailer will appear at the start,
|
||||
instead of the end, of the existing trailers.
|
||||
+
|
||||
If it is `after`, then each new trailer will appear just after the
|
||||
last trailer with the same <token>.
|
||||
+
|
||||
If it is `before`, then each new trailer will appear just before the
|
||||
first trailer with the same <token>.
|
||||
|
||||
trailer.ifexists::
|
||||
This option makes it possible to choose what action will be
|
||||
performed when there is already at least one trailer with the
|
||||
same <token> in the message.
|
||||
+
|
||||
The valid values for this option are: `addIfDifferentNeighbor` (this
|
||||
is the default), `addIfDifferent`, `add`, `overwrite` or `doNothing`.
|
||||
+
|
||||
With `addIfDifferentNeighbor`, a new trailer will be added only if no
|
||||
trailer with the same (<token>, <value>) pair is above or below the line
|
||||
where the new trailer will be added.
|
||||
+
|
||||
With `addIfDifferent`, a new trailer will be added only if no trailer
|
||||
with the same (<token>, <value>) pair is already in the message.
|
||||
+
|
||||
With `add`, a new trailer will be added, even if some trailers with
|
||||
the same (<token>, <value>) pair are already in the message.
|
||||
+
|
||||
With `replace`, an existing trailer with the same <token> will be
|
||||
deleted and the new trailer will be added. The deleted trailer will be
|
||||
the closest one (with the same <token>) to the place where the new one
|
||||
will be added.
|
||||
+
|
||||
With `doNothing`, nothing will be done; that is no new trailer will be
|
||||
added if there is already one with the same <token> in the message.
|
||||
|
||||
trailer.ifmissing::
|
||||
This option makes it possible to choose what action will be
|
||||
performed when there is not yet any trailer with the same
|
||||
<token> in the message.
|
||||
+
|
||||
The valid values for this option are: `add` (this is the default) and
|
||||
`doNothing`.
|
||||
+
|
||||
With `add`, a new trailer will be added.
|
||||
+
|
||||
With `doNothing`, nothing will be done.
|
||||
|
||||
trailer.<token>.key::
|
||||
This `key` will be used instead of <token> in the trailer. At
|
||||
the end of this key, a separator can appear and then some
|
||||
space characters. By default the only valid separator is ':',
|
||||
but this can be changed using the `trailer.separators` config
|
||||
variable.
|
||||
+
|
||||
If there is a separator, then the key will be used instead of both the
|
||||
<token> and the default separator when adding the trailer.
|
||||
|
||||
trailer.<token>.where::
|
||||
This option takes the same values as the 'trailer.where'
|
||||
configuration variable and it overrides what is specified by
|
||||
that option for trailers with the specified <token>.
|
||||
|
||||
trailer.<token>.ifexist::
|
||||
This option takes the same values as the 'trailer.ifexist'
|
||||
configuration variable and it overrides what is specified by
|
||||
that option for trailers with the specified <token>.
|
||||
|
||||
trailer.<token>.ifmissing::
|
||||
This option takes the same values as the 'trailer.ifmissing'
|
||||
configuration variable and it overrides what is specified by
|
||||
that option for trailers with the specified <token>.
|
||||
|
||||
trailer.<token>.command::
|
||||
This option can be used to specify a shell command that will
|
||||
be called to automatically add or modify a trailer with the
|
||||
specified <token>.
|
||||
+
|
||||
When this option is specified, the behavior is as if a special
|
||||
'<token>=<value>' argument were added at the beginning of the command
|
||||
line, where <value> is taken to be the standard output of the
|
||||
specified command with any leading and trailing whitespace trimmed
|
||||
off.
|
||||
+
|
||||
If the command contains the `$ARG` string, this string will be
|
||||
replaced with the <value> part of an existing trailer with the same
|
||||
<token>, if any, before the command is launched.
|
||||
+
|
||||
If some '<token>=<value>' arguments are also passed on the command
|
||||
line, when a 'trailer.<token>.command' is configured, the command will
|
||||
also be executed for each of these arguments. And the <value> part of
|
||||
these arguments, if any, will be used to replace the `$ARG` string in
|
||||
the command.
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
|
||||
* Configure a 'sign' trailer with a 'Signed-off-by' key, and then
|
||||
add two of these trailers to a message:
|
||||
+
|
||||
------------
|
||||
$ git config trailer.sign.key "Signed-off-by"
|
||||
$ cat msg.txt
|
||||
subject
|
||||
|
||||
message
|
||||
$ cat msg.txt | git interpret-trailers --trailer 'sign: Alice <alice@example.com>' --trailer 'sign: Bob <bob@example.com>'
|
||||
subject
|
||||
|
||||
message
|
||||
|
||||
Signed-off-by: Alice <alice@example.com>
|
||||
Signed-off-by: Bob <bob@example.com>
|
||||
------------
|
||||
|
||||
* Extract the last commit as a patch, and add a 'Cc' and a
|
||||
'Reviewed-by' trailer to it:
|
||||
+
|
||||
------------
|
||||
$ git format-patch -1
|
||||
0001-foo.patch
|
||||
$ git interpret-trailers --trailer 'Cc: Alice <alice@example.com>' --trailer 'Reviewed-by: Bob <bob@example.com>' 0001-foo.patch >0001-bar.patch
|
||||
------------
|
||||
|
||||
* Configure a 'sign' trailer with a command to automatically add a
|
||||
'Signed-off-by: ' with the author information only if there is no
|
||||
'Signed-off-by: ' already, and show how it works:
|
||||
+
|
||||
------------
|
||||
$ git config trailer.sign.key "Signed-off-by: "
|
||||
$ git config trailer.sign.ifmissing add
|
||||
$ git config trailer.sign.ifexists doNothing
|
||||
$ git config trailer.sign.command 'echo "$(git config user.name) <$(git config user.email)>"'
|
||||
$ git interpret-trailers <<EOF
|
||||
> EOF
|
||||
|
||||
Signed-off-by: Bob <bob@example.com>
|
||||
$ git interpret-trailers <<EOF
|
||||
> Signed-off-by: Alice <alice@example.com>
|
||||
> EOF
|
||||
|
||||
Signed-off-by: Alice <alice@example.com>
|
||||
------------
|
||||
|
||||
* Configure a 'fix' trailer with a key that contains a '#' and no
|
||||
space after this character, and show how it works:
|
||||
+
|
||||
------------
|
||||
$ git config trailer.separators ":#"
|
||||
$ git config trailer.fix.key "Fix #"
|
||||
$ echo "subject" | git interpret-trailers --trailer fix=42
|
||||
subject
|
||||
|
||||
Fix #42
|
||||
------------
|
||||
|
||||
* Configure a 'see' trailer with a command to show the subject of a
|
||||
commit that is related, and show how it works:
|
||||
+
|
||||
------------
|
||||
$ git config trailer.see.key "See-also: "
|
||||
$ git config trailer.see.ifExists "replace"
|
||||
$ git config trailer.see.ifMissing "doNothing"
|
||||
$ git config trailer.see.command "git log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14 \$ARG"
|
||||
$ git interpret-trailers <<EOF
|
||||
> subject
|
||||
>
|
||||
> message
|
||||
>
|
||||
> see: HEAD~2
|
||||
> EOF
|
||||
subject
|
||||
|
||||
message
|
||||
|
||||
See-also: fe3187489d69c4 (subject of related commit)
|
||||
------------
|
||||
|
||||
* Configure a commit template with some trailers with empty values
|
||||
(using sed to show and keep the trailing spaces at the end of the
|
||||
trailers), then configure a commit-msg hook that uses
|
||||
'git interpret-trailers' to remove trailers with empty values and
|
||||
to add a 'git-version' trailer:
|
||||
+
|
||||
------------
|
||||
$ sed -e 's/ Z$/ /' >commit_template.txt <<EOF
|
||||
> ***subject***
|
||||
>
|
||||
> ***message***
|
||||
>
|
||||
> Fixes: Z
|
||||
> Cc: Z
|
||||
> Reviewed-by: Z
|
||||
> Signed-off-by: Z
|
||||
> EOF
|
||||
$ git config commit.template commit_template.txt
|
||||
$ cat >.git/hooks/commit-msg <<EOF
|
||||
> #!/bin/sh
|
||||
> git interpret-trailers --trim-empty --trailer "git-version: \$(git describe)" "\$1" > "\$1.new"
|
||||
> mv "\$1.new" "\$1"
|
||||
> EOF
|
||||
$ chmod +x .git/hooks/commit-msg
|
||||
------------
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
@ -62,9 +62,9 @@ produced by `--stat`, etc.
|
||||
output by allowing them to allocate space in advance.
|
||||
|
||||
-L <start>,<end>:<file>::
|
||||
-L :<regex>:<file>::
|
||||
-L :<funcname>:<file>::
|
||||
Trace the evolution of the line range given by "<start>,<end>"
|
||||
(or the funcname regex <regex>) within the <file>. You may
|
||||
(or the function name regex <funcname>) within the <file>. You may
|
||||
not give any pathspec limiters. This is currently limited to
|
||||
a walk starting from a single revision, i.e., you may only
|
||||
give zero or one positive revision arguments.
|
||||
@ -184,7 +184,13 @@ log.date::
|
||||
`--date` option.) Defaults to "default", which means to write
|
||||
dates like `Sat May 8 19:35:34 2010 -0500`.
|
||||
|
||||
log.showroot::
|
||||
log.follow::
|
||||
If a single <path> is given to git log, it will act as
|
||||
if the `--follow` option was also used. This has the same
|
||||
limitations as `--follow`, i.e. it cannot be used to follow
|
||||
multiple files and does not work well on non-linear history.
|
||||
|
||||
log.showRoot::
|
||||
If `false`, `git log` and related commands will not treat the
|
||||
initial commit as a big creation event. Any root commits in
|
||||
`git log -p` output would be shown without a diff attached.
|
||||
|
@ -66,6 +66,11 @@ conversion, even with this flag.
|
||||
-n::
|
||||
Disable all charset re-coding of the metadata.
|
||||
|
||||
-m::
|
||||
--message-id::
|
||||
Copy the Message-ID header at the end of the commit message. This
|
||||
is useful in order to associate commits with mailing list discussions.
|
||||
|
||||
--scissors::
|
||||
Remove everything in body before a scissors line. A line that
|
||||
mainly consists of scissors (either ">8" or "8<") and perforation
|
||||
|
@ -78,7 +78,7 @@ will be appended to the specified message.
|
||||
+
|
||||
The 'git fmt-merge-msg' command can be
|
||||
used to give a good default for automated 'git merge'
|
||||
invocations.
|
||||
invocations. The automated message can include the branch description.
|
||||
|
||||
--[no-]rerere-autoupdate::
|
||||
Allow the rerere mechanism to update the index with the
|
||||
@ -104,6 +104,10 @@ commit or stash your changes before running 'git merge'.
|
||||
If no commit is given from the command line, merge the remote-tracking
|
||||
branches that the current branch is configured to use as its upstream.
|
||||
See also the configuration section of this manual page.
|
||||
+
|
||||
When `FETCH_HEAD` (and no other commit) is specified, the branches
|
||||
recorded in the `.git/FETCH_HEAD` file by the previous invocation
|
||||
of `git fetch` for merging are merged to the current branch.
|
||||
|
||||
|
||||
PRE-MERGE CHECKS
|
||||
@ -232,7 +236,7 @@ Barbie's remark on your side. The only thing you can tell is that your
|
||||
side wants to say it is hard and you'd prefer to go shopping, while the
|
||||
other side wants to claim it is easy.
|
||||
|
||||
An alternative style can be used by setting the "merge.conflictstyle"
|
||||
An alternative style can be used by setting the "merge.conflictStyle"
|
||||
configuration variable to "diff3". In "diff3" style, the above conflict
|
||||
may look like this:
|
||||
|
||||
@ -329,7 +333,7 @@ CONFIGURATION
|
||||
-------------
|
||||
include::merge-config.txt[]
|
||||
|
||||
branch.<name>.mergeoptions::
|
||||
branch.<name>.mergeOptions::
|
||||
Sets default options for merging into branch <name>. The syntax and
|
||||
supported options are the same as those of 'git merge', but option
|
||||
values containing whitespace characters are currently not supported.
|
||||
|
@ -9,10 +9,10 @@ SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git notes' [list [<object>]]
|
||||
'git notes' add [-f] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
|
||||
'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
|
||||
'git notes' copy [-f] ( --stdin | <from-object> <to-object> )
|
||||
'git notes' append [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
|
||||
'git notes' edit [<object>]
|
||||
'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
|
||||
'git notes' edit [--allow-empty] [<object>]
|
||||
'git notes' show [<object>]
|
||||
'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>
|
||||
'git notes' merge --commit [-v | -q]
|
||||
@ -101,7 +101,7 @@ merge::
|
||||
any) into the current notes ref (called "local").
|
||||
+
|
||||
If conflicts arise and a strategy for automatically resolving
|
||||
conflicting notes (see the -s/--strategy option) is not given,
|
||||
conflicting notes (see the "NOTES MERGE STRATEGIES" section) is not given,
|
||||
the "manual" resolver is used. This resolver checks out the
|
||||
conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`),
|
||||
and instructs the user to manually resolve the conflicts there.
|
||||
@ -155,6 +155,10 @@ OPTIONS
|
||||
Like '-C', but with '-c' the editor is invoked, so that
|
||||
the user can further edit the note message.
|
||||
|
||||
--allow-empty::
|
||||
Allow an empty note object to be stored. The default behavior is
|
||||
to automatically remove empty notes.
|
||||
|
||||
--ref <ref>::
|
||||
Manipulate the notes tree in <ref>. This overrides
|
||||
'GIT_NOTES_REF' and the "core.notesRef" configuration. The ref
|
||||
@ -179,6 +183,7 @@ OPTIONS
|
||||
When merging notes, resolve notes conflicts using the given
|
||||
strategy. The following strategies are recognized: "manual"
|
||||
(default), "ours", "theirs", "union" and "cat_sort_uniq".
|
||||
This option overrides the "notes.mergeStrategy" configuration setting.
|
||||
See the "NOTES MERGE STRATEGIES" section below for more
|
||||
information on each notes merge strategy.
|
||||
|
||||
@ -243,6 +248,9 @@ When done, the user can either finalize the merge with
|
||||
'git notes merge --commit', or abort the merge with
|
||||
'git notes merge --abort'.
|
||||
|
||||
Users may select an automated merge strategy from among the following using
|
||||
either -s/--strategy option or configuring notes.mergeStrategy accordingly:
|
||||
|
||||
"ours" automatically resolves conflicting notes in favor of the local
|
||||
version (i.e. the current notes ref).
|
||||
|
||||
@ -287,7 +295,7 @@ arbitrary files using 'git hash-object':
|
||||
------------
|
||||
$ cc *.c
|
||||
$ blob=$(git hash-object -w a.out)
|
||||
$ git notes --ref=built add -C "$blob" HEAD
|
||||
$ git notes --ref=built add --allow-empty -C "$blob" HEAD
|
||||
------------
|
||||
|
||||
(You cannot simply use `git notes --ref=built add -F a.out HEAD`
|
||||
@ -306,6 +314,20 @@ core.notesRef::
|
||||
This setting can be overridden through the environment and
|
||||
command line.
|
||||
|
||||
notes.mergeStrategy::
|
||||
Which merge strategy to choose by default when resolving notes
|
||||
conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or
|
||||
`cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES"
|
||||
section above for more information on each strategy.
|
||||
+
|
||||
This setting can be overridden by passing the `--strategy` option.
|
||||
|
||||
notes.<name>.mergeStrategy::
|
||||
Which merge strategy to choose when doing a notes merge into
|
||||
refs/notes/<name>. This overrides the more general
|
||||
"notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section above
|
||||
for more information on each available strategy.
|
||||
|
||||
notes.displayRef::
|
||||
Which ref (or refs, if a glob or specified more than once), in
|
||||
addition to the default set by `core.notesRef` or
|
||||
@ -327,7 +349,8 @@ environment variable.
|
||||
notes.rewriteMode::
|
||||
When copying notes during a rewrite, what to do if the target
|
||||
commit already has a note. Must be one of `overwrite`,
|
||||
`concatenate`, and `ignore`. Defaults to `concatenate`.
|
||||
`concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to
|
||||
`concatenate`.
|
||||
+
|
||||
This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
|
||||
environment variable.
|
||||
@ -364,7 +387,7 @@ does not match any refs is silently ignored.
|
||||
'GIT_NOTES_REWRITE_MODE'::
|
||||
When copying notes during a rewrite, what to do if the target
|
||||
commit already has a note.
|
||||
Must be one of `overwrite`, `concatenate`, and `ignore`.
|
||||
Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
|
||||
This overrides the `core.rewriteMode` setting.
|
||||
|
||||
'GIT_NOTES_REWRITE_REF'::
|
||||
|
@ -225,9 +225,20 @@ Git repository:
|
||||
they can find the p4 branches in refs/heads.
|
||||
|
||||
--max-changes <n>::
|
||||
Limit the number of imported changes to 'n'. Useful to
|
||||
limit the amount of history when using the '@all' p4 revision
|
||||
specifier.
|
||||
Import at most 'n' changes, rather than the entire range of
|
||||
changes included in the given revision specifier. A typical
|
||||
usage would be use '@all' as the revision specifier, but then
|
||||
to use '--max-changes 1000' to import only the last 1000
|
||||
revisions rather than the entire revision history.
|
||||
|
||||
--changes-block-size <n>::
|
||||
The internal block size to use when converting a revision
|
||||
specifier such as '@all' into a list of specific change
|
||||
numbers. Instead of using a single call to 'p4 changes' to
|
||||
find the full list of changes for the conversion, there are a
|
||||
sequence of calls to 'p4 changes -m', each of which requests
|
||||
one block of changes of the given size. The default block size
|
||||
is 500, which should usually be suitable.
|
||||
|
||||
--keep-path::
|
||||
The mapping of file names from the p4 depot path to Git, by
|
||||
@ -241,6 +252,9 @@ Git repository:
|
||||
Use a client spec to find the list of interesting files in p4.
|
||||
See the "CLIENT SPEC" section below.
|
||||
|
||||
-/ <path>::
|
||||
Exclude selected depot paths when cloning or syncing.
|
||||
|
||||
Clone options
|
||||
~~~~~~~~~~~~~
|
||||
These options can be used in an initial 'clone', along with the 'sync'
|
||||
@ -254,9 +268,6 @@ options described above.
|
||||
--bare::
|
||||
Perform a bare clone. See linkgit:git-clone[1].
|
||||
|
||||
-/ <path>::
|
||||
Exclude selected depot paths when cloning.
|
||||
|
||||
Submit options
|
||||
~~~~~~~~~~~~~~
|
||||
These options can be used to modify 'git p4 submit' behavior.
|
||||
|
@ -13,7 +13,7 @@ SYNOPSIS
|
||||
[--no-reuse-delta] [--delta-base-offset] [--non-empty]
|
||||
[--local] [--incremental] [--window=<n>] [--depth=<n>]
|
||||
[--revs [--unpacked | --all]] [--stdout | base-name]
|
||||
[--keep-true-parents] < object-list
|
||||
[--shallow] [--keep-true-parents] < object-list
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
@ -190,6 +190,11 @@ required objects and is thus unusable by Git without making it
|
||||
self-contained. Use `git index-pack --fix-thin`
|
||||
(see linkgit:git-index-pack[1]) to restore the self-contained property.
|
||||
|
||||
--shallow::
|
||||
Optimize a pack that will be provided to a client with a shallow
|
||||
repository. This option, combined with --thin, can result in a
|
||||
smaller pack at the cost of speed.
|
||||
|
||||
--delta-base-offset::
|
||||
A packed archive can express the base object of a delta as
|
||||
either a 20-byte object name or as an offset in the
|
||||
|
@ -1,5 +1,5 @@
|
||||
git-prune-packed(1)
|
||||
=====================
|
||||
===================
|
||||
|
||||
NAME
|
||||
----
|
||||
|
@ -74,9 +74,6 @@ pulling or stash them away with linkgit:git-stash[1].
|
||||
OPTIONS
|
||||
-------
|
||||
|
||||
Options meant for 'git pull' itself and the underlying 'git merge'
|
||||
must be given before the options meant for 'git fetch'.
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
This is passed to both underlying git-fetch to squelch reporting of
|
||||
@ -111,13 +108,12 @@ include::merge-options.txt[]
|
||||
was rebased since last fetched, the rebase uses that information
|
||||
to avoid rebasing non-local changes.
|
||||
+
|
||||
When preserve, also rebase the current branch on top of the upstream
|
||||
branch, but pass `--preserve-merges` along to `git rebase` so that
|
||||
locally created merge commits will not be flattened.
|
||||
When set to preserve, rebase with the `--preserve-merges` option passed
|
||||
to `git rebase` so that locally created merge commits will not be flattened.
|
||||
+
|
||||
When false, merge the current branch into the upstream branch.
|
||||
+
|
||||
See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
|
||||
See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in
|
||||
linkgit:git-config[1] if you want to make `git pull` always use
|
||||
`--rebase` instead of merging.
|
||||
+
|
||||
|
@ -9,8 +9,10 @@ git-push - Update remote refs along with associated objects
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git push' [--all | --mirror | --tags] [--follow-tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
|
||||
[--repo=<repository>] [-f | --force] [--prune] [-v | --verbose] [-u | --set-upstream]
|
||||
'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
|
||||
[--repo=<repository>] [-f | --force] [--prune] [-v | --verbose]
|
||||
[-u | --set-upstream]
|
||||
[--[no-]signed|--sign=(true|false|if-asked)]
|
||||
[--force-with-lease[=<refname>[:<expect>]]]
|
||||
[--no-verify] [<repository> [<refspec>...]]
|
||||
|
||||
@ -127,7 +129,25 @@ already exists on the remote side.
|
||||
Push all the refs that would be pushed without this option,
|
||||
and also push annotated tags in `refs/tags` that are missing
|
||||
from the remote but are pointing at commit-ish that are
|
||||
reachable from the refs being pushed.
|
||||
reachable from the refs being pushed. This can also be specified
|
||||
with configuration variable 'push.followTags'. For more
|
||||
information, see 'push.followTags' in linkgit:git-config[1].
|
||||
|
||||
--[no-]signed::
|
||||
--sign=(true|false|if-asked)::
|
||||
GPG-sign the push request to update refs on the receiving
|
||||
side, to allow it to be checked by the hooks and/or be
|
||||
logged. If `false` or `--no-signed`, no signing will be
|
||||
attempted. If `true` or `--signed`, the push will fail if the
|
||||
server does not support signed pushes. If set to `if-asked`,
|
||||
sign if and only if the server supports signed pushes. The push
|
||||
will also fail if the actual call to `gpg --sign` fails. See
|
||||
linkgit:git-receive-pack[1] for the details on the receiving end.
|
||||
|
||||
--[no-]atomic::
|
||||
Use an atomic transaction on the remote side if available.
|
||||
Either all refs are updated, or on error, no refs are updated.
|
||||
If the server does not support atomic pushes the push will fail.
|
||||
|
||||
--receive-pack=<git-receive-pack>::
|
||||
--exec=<git-receive-pack>::
|
||||
@ -142,9 +162,8 @@ already exists on the remote side.
|
||||
Usually, "git push" refuses to update a remote ref that is
|
||||
not an ancestor of the local ref used to overwrite it.
|
||||
+
|
||||
This option bypasses the check, but instead requires that the
|
||||
current value of the ref to be the expected value. "git push"
|
||||
fails otherwise.
|
||||
This option overrides this restriction if the current value of the
|
||||
remote ref is the expected value. "git push" fails otherwise.
|
||||
+
|
||||
Imagine that you have to rebase what you have already published.
|
||||
You will have to bypass the "must fast-forward" rule in order to
|
||||
@ -156,15 +175,14 @@ commit, and blindly pushing with `--force` will lose her work.
|
||||
This option allows you to say that you expect the history you are
|
||||
updating is what you rebased and want to replace. If the remote ref
|
||||
still points at the commit you specified, you can be sure that no
|
||||
other people did anything to the ref (it is like taking a "lease" on
|
||||
the ref without explicitly locking it, and you update the ref while
|
||||
making sure that your earlier "lease" is still valid).
|
||||
other people did anything to the ref. It is like taking a "lease" on
|
||||
the ref without explicitly locking it, and the remote ref is updated
|
||||
only if the "lease" is still valid.
|
||||
+
|
||||
`--force-with-lease` alone, without specifying the details, will protect
|
||||
all remote refs that are going to be updated by requiring their
|
||||
current value to be the same as the remote-tracking branch we have
|
||||
for them, unless specified with a `--force-with-lease=<refname>:<expect>`
|
||||
option that explicitly states what the expected value is.
|
||||
for them.
|
||||
+
|
||||
`--force-with-lease=<refname>`, without specifying the expected value, will
|
||||
protect the named ref (alone), if it is going to be updated, by
|
||||
@ -207,22 +225,8 @@ origin +master` to force a push to the `master` branch). See the
|
||||
`<refspec>...` section above for details.
|
||||
|
||||
--repo=<repository>::
|
||||
This option is only relevant if no <repository> argument is
|
||||
passed in the invocation. In this case, 'git push' derives the
|
||||
remote name from the current branch: If it tracks a remote
|
||||
branch, then that remote repository is pushed to. Otherwise,
|
||||
the name "origin" is used. For this latter case, this option
|
||||
can be used to override the name "origin". In other words,
|
||||
the difference between these two commands
|
||||
+
|
||||
--------------------------
|
||||
git push public #1
|
||||
git push --repo=public #2
|
||||
--------------------------
|
||||
+
|
||||
is that #1 always pushes to "public" whereas #2 pushes to "public"
|
||||
only if the current branch does not track a remote branch. This is
|
||||
useful if you write an alias or script around 'git push'.
|
||||
This option is equivalent to the <repository> argument. If both
|
||||
are specified, the command-line argument takes precedence.
|
||||
|
||||
-u::
|
||||
--set-upstream::
|
||||
@ -266,8 +270,8 @@ useful if you write an alias or script around 'git push'.
|
||||
|
||||
--[no-]verify::
|
||||
Toggle the pre-push hook (see linkgit:githooks[5]). The
|
||||
default is \--verify, giving the hook a chance to prevent the
|
||||
push. With \--no-verify, the hook is bypassed completely.
|
||||
default is --verify, giving the hook a chance to prevent the
|
||||
push. With --no-verify, the hook is bypassed completely.
|
||||
|
||||
|
||||
include::urls-remotes.txt[]
|
||||
|
@ -1,5 +1,5 @@
|
||||
git-quiltimport(1)
|
||||
================
|
||||
==================
|
||||
|
||||
NAME
|
||||
----
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user