17b1e1d76c
Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths'
...
The http.{sslkey,sslCert} configuration variables are to be
interpreted as a pathname that honors "~[username]/" prefix, but
weren't, which has been fixed.
* jc/http-sslkey-and-ssl-cert-are-paths:
http.c: http.sslcert and http.sslkey are both pathnames
2017-08-11 13:26:59 -07:00
e72ecd324c
Merge branch 'jk/c99'
...
Start using selected c99 constructs in small, stable and
essentialpart of the system to catch people who care about
older compilers that do not grok them.
* jk/c99:
clean.c: use designated initializer
strbuf: use designated initializers in STRBUF_INIT
2017-08-11 13:26:58 -07:00
15595ce438
Merge branch 'jk/ref-filter-colors'
...
"%C(color name)" in the pretty print format always produced ANSI
color escape codes, which was an early design mistake. They now
honor the configuration (e.g. "color.ui = never") and also tty-ness
of the output medium.
* jk/ref-filter-colors:
ref-filter: consult want_color() before emitting colors
pretty: respect color settings for %C placeholders
rev-list: pass diffopt->use_colors through to pretty-print
for-each-ref: load config earlier
color: check color.ui in git_default_config()
ref-filter: pass ref_format struct to atom parsers
ref-filter: factor out the parsing of sorting atoms
ref-filter: make parse_ref_filter_atom a private function
ref-filter: provide a function for parsing sort options
ref-filter: move need_color_reset_at_eol into ref_format
ref-filter: abstract ref format into its own struct
ref-filter: simplify automatic color reset
t: use test_decode_color rather than literal ANSI codes
docs/for-each-ref: update pointer to color syntax
check return value of verify_ref_format()
2017-08-11 13:26:58 -07:00
076eeec8be
Merge branch 'wd/rebase-conflict-guide'
...
The advice message given when "git rebase" stops for conflicting
changes has been improved.
* wd/rebase-conflict-guide:
rebase: make resolve message clearer for inexperienced users
2017-08-11 13:26:58 -07:00
12deaf66d4
Merge branch 'rs/stat-data-unaligned-reads-fix'
...
Code clean-up.
* rs/stat-data-unaligned-reads-fix:
dir: support platforms that require aligned reads
2017-08-11 13:26:58 -07:00
32f90258bd
Merge branch 'rs/move-array'
...
Code clean-up.
* rs/move-array:
ls-files: don't try to prune an empty index
apply: use COPY_ARRAY and MOVE_ARRAY in update_image()
use MOVE_ARRAY
add MOVE_ARRAY
2017-08-11 13:26:57 -07:00
c2bfd0f9cb
Merge branch 'rs/bswap-ubsan-fix'
...
Code clean-up.
* rs/bswap-ubsan-fix:
bswap: convert get_be16, get_be32 and put_be32 to inline functions
bswap: convert to unsigned before shifting in get_be32
2017-08-11 13:26:57 -07:00
127f98f42b
Merge branch 'ks/prepare-commit-msg-sample'
...
Remove an example that is now obsolete from a sample hook,
and improve an old example in it that added a sign-off manually
to use the interpret-trailers command.
* ks/prepare-commit-msg-sample:
hook: add a simple first example
hook: add sign-off using "interpret-trailers"
hook: name the positional variables
hook: cleanup script
2017-08-11 13:26:56 -07:00
c7528f4d8a
Merge branch 'bw/object-id'
...
Conversion from uchar[20] to struct object_id continues.
* bw/object-id:
receive-pack: don't access hash of NULL object_id pointer
notes: don't access hash of NULL object_id pointer
tree-diff: don't access hash of NULL object_id pointer
2017-08-11 13:26:56 -07:00
df422678a8
Merge branch 'bc/object-id'
...
Conversion from uchar[20] to struct object_id continues.
* bc/object-id:
sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ
sha1_name: convert GET_SHA1* flags to GET_OID*
sha1_name: convert get_sha1* to get_oid*
Convert remaining callers of get_sha1 to get_oid.
builtin/unpack-file: convert to struct object_id
bisect: convert bisect_checkout to struct object_id
builtin/update_ref: convert to struct object_id
sequencer: convert to struct object_id
remote: convert struct push_cas to struct object_id
submodule: convert submodule config lookup to use object_id
builtin/merge-tree: convert remaining caller of get_sha1 to object_id
builtin/fsck: convert remaining caller of get_sha1 to object_id
2017-08-11 13:26:55 -07:00
3943f6caaa
Merge branch 'sb/object-id'
...
Conversion from uchar[20] to struct object_id continues.
* sb/object-id:
tag: convert gpg_verify_tag to use struct object_id
commit: convert lookup_commit_graft to struct object_id
2017-08-11 13:26:55 -07:00
4274c698f4
Git 2.14.1
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZhM4RAAoJELC16IaWr+bLzGcQAOh3MYjKeZ4V2XghvFlzXHOa
8Q2/PiLuPxDoVJan7h4HZXnHdT1DRY8QFwLR88vwxqXSeuVMhJYdfmo8qkIeCI++
ZldLoEX08UhXWRUS/0Inr3f9BgAYqILSi7k8CNTV/pNkwQh4+mWsBvJ7ma+PgO0I
+1ErShop2ciWC9mwlqvQp7AA7+eUisAXeIDULUtE57JrAXIpl49vhPOWMDw4wPIf
8U+Pk5rchivbjKGDHRYf5/Qb/UVx3kraPbEBHxAu9tEUnn5RcTsPZd5WvQLdZeya
EjKI9VPsmhhoYj+U2KcsSaJ1g2vQheh529yDF0lxeHWa03T+ItROCJNMNoLrUq+v
D28fH3Z3y3B1Sv3v9hKsLO1t4O4Q03hsTga05omNc1utnYmNC1aDu5EQ0LGnmcgR
ToLSnnzO8hrqaYYnOG6EzYnbltxKr7MyNIh62MjSvOgKD5RgZ/OREO+Z1GmyEDWv
NdrcgCGOJTVAEdiEN5gD2JZCoCE/iAmQWpshktD4Y+lcejl4/rdVHNlLB35sCC6y
Gcn1d8sRrmAI290tdlMu+1+77H3es7eSGPvm0V65gMDcin5M0ZCjpPMj4rKN4P6v
sTVUM4u5cSwfswkAlPB9nBs+/9IdtD+aP1SN8Fi2Nv4EGjYyD+Xr32aJomv8wQ7I
81smo0FkWMCnGzG8quyx
=fMiT
-----END PGP SIGNATURE-----
Merge tag 'v2.14.1'
2017-08-04 12:45:17 -07:00
85df69e47e
Start post 2.14 cycle
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-04 12:44:55 -07:00
4d7268b888
Git 2.14.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-04 12:41:54 -07:00
230ce07d13
Git 2.13.5
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZgNa+AAoJELC16IaWr+bLaMIP/1tHYbkQ/iMvYE8RpV5SXZOC
nKm8IHP4Hu+05gmp874Gw3XtF+FELC53Q2nMc3L4mJ/ZSjuJOuein9aVisapBluw
IZ8UaxmgN1NUA8gDVkXULNMJGDaOQw+VckMrEAI3A0uYXGY2eAiHR3Q+p0txhHb9
jfhSsnl7Rv3q6LeDOPMKpwPVT0+uxBklrli7YcIn9IssbQhAvDUpbZ0Ab/fEOH6j
NDIsZZ8opEESsUE5WBCOVXKUYjZOpLLpU4dQXa+JBj019LRmUYxLgjGVt2BSuUh/
K8xe6/3P1FOQF1tMY4Bjb2iIUnc0wzIQYULn9dqJthV0Ybz0qwT5bTt4IYYKs86I
/XjJPI9cAQHNirafyUyTrWy95HGnvYSyvmNC4a2ElvD24i/GKCuRQY7O5MCT3fjB
5jUH2VxxA5E1TvkeG4VHl0d8WZib+/4CWd0OwSXk9LJJC/C/OTUlBa2dakOpwtgS
RNGM+8+gzzd5rv1/UL+vAiqtCYjDfU+uqsjP5fRnMyTZiCmbhRcdW9b1TRc4OMoe
wpbSbz0L18IAsyqZ+KLhyZOCr5mxjrVCxV++efI+NhsRecmO5nbPNtRGKf7/AtAQ
+e5hROZRSFwf8/bXoobcOvhpuvW36+0mVXxIOGIoYtXB6AdtvGFXi9TnC/rTLBZG
zuj/z2fmgo3F0G2tnNxk
=t0hU
-----END PGP SIGNATURE-----
Merge tag 'v2.13.5' into maint
2017-08-04 12:40:37 -07:00
4384e3cde2
Git 2.14
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-04 09:31:12 -07:00
62ebe03b9e
Merge branch 'ah/patch-id-doc'
...
Docfix.
* ah/patch-id-doc:
doc: remove unsupported parameter from patch-id
2017-08-04 09:29:15 -07:00
ddd1133c5e
Merge branch 'as/diff-options-grammofix'
...
A grammofix.
* as/diff-options-grammofix:
diff-options doc: grammar fix
2017-08-04 09:29:14 -07:00
384a8b271c
l10n for Git 2.14.0 round 2
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJZgRf5AAoJEMek6Rt1RHooTBoQAI9sepb2JHPV0K/twKAFpMhj
bXML7cE0Duf9J/30UUdAymEX5ao6NSfRtQz3qzP9l+JgrzKJ4C2QQ0mMo/8t3F3w
hDyOaDmd3NvDl6QTqRFEY/OtLbDCXYt8K8XfzqPgIWmQIILxCjsESfL7M5yodscG
qakFYjevvBtRsdXygwEhSGHZVgJcqJPUdW2mgEXpPayRXAceSpmhCKZB5GwMim37
1cM96nudMI2AfwfDd9BMd1uyn7p5Hop2sEDIwqu/ZJPvtKMYJzBgAT0iQipLEBHw
hbBQLIuyS8MXKtU7J6eMOs0c3gdYSVxK+dX6X/X7JRRdMr7FmHc1mHoI3iv0XsUD
AAMpGO08Fcf9fTL2XYvffpzKXPdT2m1aPw77E728ssLqON2mIy5OjO0lGO3BlBOq
VNWxE9Jj8FbyVpEuOH1lH2VxA8KU6p6EbpukqGqoRFGZVvwIJhWyINIOUk7aiLc3
j7JBFhdQNJXTuqmuS1VKrkPqYd5cz95uYRWWt/OlFHIzQA7iWXsJQIwj9xCo1Weu
H6c9ekGjguo6892hgF7tuQ8svQhUhH8X/dU2X/IM+KL+jfZZ4sr+lD+v3iuMTNOZ
9YmL5M9SCadFUguHVFNOdWUwhW9TH/goDMBKd6Gq6hN8Y9RlJBem7kRwkc/OKh/L
1VGVpjUHDSd/Sog20gcT
=RMsi
-----END PGP SIGNATURE-----
Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po
l10n for Git 2.14.0 round 2
* tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po:
l10n: zh_CN: review for git v2.14.0 l10n
l10n: ko.po: Update Korean translation
l10n: zh_CN: for git v2.14.0 l10n round 2
l10n: de.po: various fixes in German translation
l10n: ru.po: update Russian translation
l10n: fr.po v2.14.0 rnd 2
l10n: fr.po Fix some french typos
l10n: fr.po Fix typo
l10n: fr.po Fix some translations
l10n: de.po: update German translation
l10n: vi.po (3213t): Updated 9 new strings
l10n: Update Catalan translation
l10n: bg.po: Updated Bulgarian translation (3213t)
2017-08-02 10:52:33 -07:00
554e850170
l10n: zh_CN: review for git v2.14.0 l10n
...
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-08-02 08:02:37 +08:00
7234152e66
Git 2.13.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-01 12:30:00 -07:00
e312af164c
Git 2.12.4
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZflhUAAoJELC16IaWr+bLDyAP/jWDc9ic8S1ZH8W4ijAB24vP
YRyQ1gbnRLhpEpbHYCUp7Uw9mrJBfdwYFlqxGJPH4JZL9qYLJUe5DJMWi5uAEptg
tYPpPMLV5hgvGICwJbOaS5NlNf2NzLjRvzziOpUnE5CcR5Bw7doCPk4Uw6AVvAvK
0x/6KDNLdKCBl3ZIoLdp9eW2PrTfYx6AK+Wf9oEgdMSB9+23acL7R/QEmH7oh9gl
BS0riRQVHnku5akybMnRjeba7SvdhJlIV8rPc4WpuMRz0g2lPzOKQ+okeRtdQrfi
REdEZ920EJR65KtxUgxYLrpPpmdRBxNI0jXC3Sm2Kac85MLvjFqhaosBWhTQuoOf
tra68Gb9WSVkKLwRhRBYOG+dx00m1UETs7cYm6pw37RiMss1pcZWNdzjNNouVEEp
3LBXcPJSpCbEjI+U/H2CqLqCk9gMfKLJXB9hK4b9jBcB9yrON2d75tPMhOcNx+Ej
x6vZ4Zql6r1Bhe8y7T6KMnLe6vdli8Vrd7Tj5btogcEUmVfRQVHZzV94utevv9A5
UEXLeCjJSjcY7rYtTdSLXgESioHW8WNfG+TPiyxjujSybtxGKmkcrSGCrugT26K8
UT5VH2mYJOuHRtWnjWEEEhjayaXLv0mHNQ5XVfNDNPEFqRBQmIhLhcIf/aOF6r+F
4Q6qN9QceJUEiaFnHsyO
=ZBXN
-----END PGP SIGNATURE-----
Merge tag 'v2.12.4' into maint
2017-08-01 12:27:31 -07:00
c3eb4e6bfe
Git 2.13.4
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZgMxGAAoJELC16IaWr+bLaB8P/3hsI/ih6bddSgFGoYU6DrWm
F7zKDa3qV0fS4bB3hEQPrkCWQTxoZdpvB3LLjChq8BUHxHfDSEs2SFmKJvS3NJxf
YfFwxAc0vlLb84vX5j+3TiPbopZu1/P+HgZY27KiuDIUGgiCkXlJn6OzJm/wRjg0
5/baGG7Qcy0lSWtWQDf09BRm+EliT6cCV0BlztfBFYW8Xp34+prhG9w0SPUXGJfZ
jMKMLzoSdrg7fYW3YRjPRdppjU21/1FQOoJOiKLv9tRgsC0fon4XNgK+683eTofu
KFiLklmxC4l70Kprlcr63zjOjd6CdfLO/fkqAqFBDMf1allbKSS0+kib6v87PeSC
Nix+OQ/c/ko0bKs3dkvsN2nKM5cCT4Xce1PdSklClwHGLqzI42nCV9dBo5CCh42/
IkqMgkpkLLeHJio1u8s6p39edmm1gJOD8XCPYG10avmRN7fsdgIB1JxL0dbIdq4L
eC+h/zNDBP8rLaytbqIPWi1dCgtVJ9b+PojY33csfrjIAAu+gL8Rxwdyaqzned8+
7Bp+UbxcVTStdNm6yIOSddZDn3nPiCNhkjXoE5JCZAqmQnzF8u2X6fwklvY97ybq
bTTvaRg9/1WR2DeEPEbgtSNztGTrIEUFkjQTn1TF/4Lz+1Rx5tE7WlAJC7TGPnpE
5pM9ux9TvJ/PRGWFuXvH
=E6cV
-----END PGP SIGNATURE-----
Sync with v2.13.4
2017-08-01 11:46:59 -07:00
cf8899d285
Git 2.13.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-01 11:45:17 -07:00
3347e76939
l10n: ko.po: Update Korean translation
...
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-08-01 12:32:00 +09:00
a4f16749d2
l10n: zh_CN: for git v2.14.0 l10n round 2
...
Translate new l10n messages for git 2.14.0, and update translations on
"stash".
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-08-01 09:26:19 +08:00
e2d9c46130
Sync with maint
...
* maint:
Preparation for 2.13.4 continues
2017-07-31 13:52:53 -07:00
c94ef19041
Preparation for 2.13.4 continues
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-31 13:52:40 -07:00
0baf0b839b
Merge branch 'ks/doc-fixes' into maint
...
Doc clean-up.
* ks/doc-fixes:
doc: reformat the paragraph containing the 'cut-line'
doc: camelCase the i18n config variables to improve readability
2017-07-31 13:51:06 -07:00
42dbdef1ca
Merge branch 'jk/test-copy-bytes-fix' into maint
...
A test fix.
* jk/test-copy-bytes-fix:
t: handle EOF in test_copy_bytes()
2017-07-31 13:51:06 -07:00
c6767f45e3
Merge branch 'pw/unquote-path-in-git-pm' into maint
...
Code refactoring.
* pw/unquote-path-in-git-pm:
t9700: add tests for Git::unquote_path()
Git::unquote_path(): throw an exception on bad path
Git::unquote_path(): handle '\a'
add -i: move unquote_path() to Git.pm
2017-07-31 13:51:05 -07:00
133578a020
Merge branch 'jk/gc-pre-detach-under-hook' into maint
...
We run an early part of "git gc" that deals with refs before
daemonising (and not under lock) even when running a background
auto-gc, which caused multiple gc processes attempting to run the
early part at the same time. This is now prevented by running the
early part also under the GC lock.
* jk/gc-pre-detach-under-hook:
gc: run pre-detach operations under lock
2017-07-31 13:51:05 -07:00
309ff914d5
Merge branch 'jn/hooks-pre-rebase-sample-fix' into maint
...
Code clean-up, that makes us in sync with Debian by one patch.
* jn/hooks-pre-rebase-sample-fix:
pre-rebase hook: capture documentation in a <<here document
2017-07-31 13:51:05 -07:00
4f77f618d9
Merge branch 'rs/progress-overall-throughput-at-the-end' into maint
...
The progress meter did not give a useful output when we haven't had
0.5 seconds to measure the throughput during the interval. Instead
show the overall throughput rate at the end, which is a much more
useful number.
* rs/progress-overall-throughput-at-the-end:
progress: show overall rate in last update
2017-07-31 13:51:04 -07:00
49f1e2eb1b
Merge branch 'tb/push-to-cygwin-unc-path' into maint
...
On Cygwin, similar to Windows, "git push //server/share/repository"
ought to mean a repository on a network share that can be accessed
locally, but this did not work correctly due to stripping the double
slashes at the beginning.
This may need to be heavily tested before it gets unleashed to the
wild, as the change is at a fairly low-level code and would affect
not just the code to decide if the push destination is local. There
may be unexpected fallouts in the path normalization.
* tb/push-to-cygwin-unc-path:
cygwin: allow pushing to UNC paths
2017-07-31 13:51:04 -07:00
bc2c50fc2c
Merge branch 'rs/apply-avoid-over-reading' into maint
...
Code cleanup.
* rs/apply-avoid-over-reading:
apply: use strcmp(3) for comparing strings in gitdiff_verify_name()
apply: use starts_with() in gitdiff_verify_name()
2017-07-31 13:51:04 -07:00
483709ab4d
Merge branch 'js/blame-lib'
...
A hotfix to a topic already in 'master'.
* js/blame-lib:
blame: fix memory corruption scrambling revision name in error message
2017-07-31 13:05:15 -07:00
bc9b7e207f
diff-options doc: grammar fix
...
Signed-off-by: Anthony Sottile <asottile@umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-31 09:57:12 -07:00
3d9c5b5c44
Git 2.12.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-30 15:06:06 -07:00
3def5e9a8d
Git 2.11.3
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZfleHAAoJELC16IaWr+bLxB8QANsdFCtO+/PFnda2CmadVt/J
d4AGMSu+cD74aUp5wzMscROCggn3vMHVeDMdVJ3ihcY6nLjJRy0EC/VJ5yTpSGli
iq2GjmoH/oTS2tq2JWbTe86VMVYAzuWlWyowwH6OymDLkBQcAOap1WfUHTmKehUi
BV2br1x15c7hRGToFqN8yed39iVmQoDJ5ETTBgFqkVyVHDdlyc81FRt0RfiA2x3N
nm5/gOOWvH5X4Cyu7yP2C9GSV9p1mufEtw1DNwp+MV3n3wa2P4wJeNnYYmW85hpS
ZzuWEM9QcU3fbShHxHcwHCyy2imXUUsfm1/Y6rCH3ZVSzo1icz5ghL2rnmcxdZvS
JMp60EKbaapUiIkI23R2Yvlh81J5frwOp739DYytlai3rZF7le9KYGQnsUrv95Ie
CvFGr3Btiy3oEVOP7xRiGnGtThmVRP4mFsIIIgf3YsBJqRXRwxqn1D6jbkHBqu7z
VfFnpp63BsKY59Udo1qilkxS2qQ35gAS+TNczPV9D0m3n3bZ5UXEMuonahAE5YwG
d20wBNOd86oK4khtMWcxXx4BBx+tlA99FfQOgxvn3XWnHmTAJE3+L0uEajZpEpcU
gkHLo0EutMY+xmX9+jwszmBS9gNL9xzFADtAoYIoAsmpaD7jBJsTjwyzstTyXLvr
5jcZT/hyX4iZtOUlC67J
=fCBm
-----END PGP SIGNATURE-----
Merge tag 'v2.11.3' into maint-2.12
Git 2.11.3
2017-07-30 15:04:22 -07:00
9315f271e3
Merge branch 'jk/lib-proto-disable-cleanup' into maint-2.12
2017-07-30 15:03:21 -07:00
3b82744481
Git 2.11.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-30 15:02:37 -07:00
05bb78abc1
Git 2.10.4
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZflbsAAoJELC16IaWr+bLUUAQAONDi4Ty/I9K79Nwv9/15HcV
4oMfCC56Y8nLUs83GsS0aZadX15iABsOACtZUA0kPQB8PV2XYcUnM6rPFtpeovRI
sfs0XqfK5l+cVDoMMb2sGAfQYEBIXRy8sUb1EXIuJ4MzHxfRbmm1sKd7ko3lg6hN
JHhGsNpzIVRspuUZh+yXp0Qa8CKKnekhwEntVd5b71eahG3lJNBO7UXvDAkDyl33
amoc5eqKdoGvjs3yYBvOV0qX8ePV53wieKwL5uBG6LdjMrjtWpLJOuMk6IYR18Sm
++A+WiCb14lQ/6Wfu+r7WhjaWIXHHMPV/5YMhm1OzrWKiw+DuucLVaorl3cSPA2G
zNPoHGUGxfnKz0NLiMkpbjUfB0gYqqLKts5pcnKeTconUcLZlpYKEYNpypfgbJyr
XvIgkjAt3KwRa8mrGvCURkelmYKzFzd+hZdxvXiJ/flk4CcssgMgYorWCMwwy86a
uErlgWDcGh9wtV9Pwy8M7EwXcRDggBND5jqH2dpFUaQ+8Kzm11lX5BRseZIOASzL
++MuZGEQiETz2HkWb+DWMIDAJMej2N2DF1eq7DnsmEUZgOarf2ZP3Lsd84W43WLI
PdLhA1zpL2YVz9EEeFT/hLSX3fC16+lkeVQhtV5pJlIiLumHOdWYBElsnX694Nv3
JTE4X1l38kCBQ4on8eEo
=R9MM
-----END PGP SIGNATURE-----
Merge tag 'v2.10.4' into maint-2.11
Git 2.10.4
2017-07-30 15:01:31 -07:00
0bfff8146f
Git 2.10.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-30 15:00:04 -07:00
d78f06a1b7
Git 2.9.5
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZflVaAAoJELC16IaWr+bL/5QP/1NoUGqrwB+zwJ8+oDqd+Djl
PX8qyafoMXJr/w/fACk8r/tCSGKgK8Gx9FqZ9GIBCAZVNXkQnheRElOjiuRg4rbl
+USiN2XM4ue/X7GqEBc7YVAmd+ifFFQ+ckm1g72A53B4Qh4/Ca4MnPYLOi7eKfC1
85f+/zMj/5pYsmboFZzFiUPq+Khyb2e85Mm9ok+l/8zAXt4ER5cf4mhY3KSEtnfA
6qGVUJ3fS9FzE4ud+/cx2qidsTrzZI/Hpv+3TVVXzSv5j32D3srnumLs+XnVIarV
nJFoVUZV/XSC80YUkwbcdY6Rs2gVfhHJK6zVcs8MfHC28o+ZJDM+ceGVnUKcdpDW
Gejsc7l0Blt0IodLoHAemBOsF3eeQBh5M5vodHdEFTiCdGRcCX3lvPxikCILW1Fv
4FPmrjfOlWEz0ktV4eKacX+DVAa2p9P09v0B6pKFt/l5MiHKla8qdYXLjEnEHHaN
ywIJPK0Lbgr+rjf3XcEQ96sjP+2XOcmtwTxychEcQ7Z2IwqyJA/GtdyCh1/jinap
0M9odRHtYHRk1qUcZBLosM3C3Y0rgc2k1RZJRgdAY1kiBezctoU6FkH5Pb7LFRtH
hr3/llk9X1ivh6fruLZ6Lu2EZ/vJVOwtUNLFqPO8fLP4cABkhDdxX13o5PS+qYMJ
THXReDUV4vgtmzKrgJ+7
=w1+M
-----END PGP SIGNATURE-----
Merge tag 'v2.9.5' into maint-2.10
Git 2.9.5
2017-07-30 14:57:33 -07:00
4d4165b80d
Git 2.9.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-30 14:53:25 -07:00
af0178aec7
Git 2.8.6
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZflRcAAoJELC16IaWr+bLOnAQAIEtjMActDfpYb+tXftBIzzm
Od/tBG3WZMRPyq/fWExV9nPO5xYOf6O9PlU6H7rNMDh+2n5/ypxqEXDvjzNHRMyh
TIk1oAjG0zDiSe/fHO4v3fcCeIne0C0ZDwzYjS9+mSnybmPRLMQ1j8ykV7oBIUlB
A081Tcb86bxG9kdxO4Sih+0zIglZ1lNA9fH7PqY5v/DqBY9TkaZIuoEjCIo7wUYu
k+kSrNjXWz8HdYovpO/snhgtU7TFS7OtWmYEvXBg4+p6R1nGCuSWejHeWrbqx3fI
QPXdLXIua/NqZKdd6ad4K+K91XW1OaqnK49IY58sSzHXYiDRnfnmBDzduyuagEE1
C3BQhALMvkGZBmkNI1unZBqxsz4E7hviyxeOt1W3Z/I8mt6IGGnLWg+oVEy4b3yj
TAx4rQJs1xmGU5maR25yBnQI/ElZWHNg+vrtGhdt5XvklASwn8egukjAjUWJodie
hs/BiMKf+Rk7dVPY6RnK94pHWtNpkTlD9VCaLXhmFN863Zc3DwYBcbUF2D78d5G8
zLG1pQRtWizAjF9XJ/q01JAutHUyyoYGWwa8lKJvplxQaXwe0bntzPILZN81G1Cy
mC955bsbyIGv+88elRAeYpu7SxQJ1uGmpMYcamdLr7irDF2bUZp7n55Ogia4IKvK
LgvwELkejo1WgDBYvqET
=iOsd
-----END PGP SIGNATURE-----
Merge tag 'v2.8.6' into maint-2.9
Git 2.8.6
2017-07-30 14:52:14 -07:00
8d7f72f176
Git 2.8.6
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-30 14:49:08 -07:00
7720c33f63
Git 2.7.6
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJZflNxAAoJELC16IaWr+bLpSsQAIT1s4c/uKAXJBw8CegM4SP1
SeB5NMnjz7VVtBsdXKPy6fVXBHCjffON/MvNXcXwGqzx3lh6SiMAVNjYknBkQcKN
b639dD9HEEBRFf62a+QAyRYbFeg0NONVydB25s7RfR57HUNxFibaJDT5SoymO0/5
YCdmMENuvijvCYcwyb3MSjAKCkwDDErPzyI4NZ2YZpC7IG46Uoxq8BCdHpKhXa5I
3TNEDruBAd/UJCIQiMW1HP3OMQXzXmCTL5i4QSr/uloO1kNzkWgCZDkkFrSGFPdx
UeTRXOM0r5QdFXZC36zZNoL5ELflgzrYFSerj6VkCAbiG4FAWL+43CCxuUcq5OkZ
JsTYObieBMFiaowTn9hKo3ix1xDSjR2+p0bfZbOPy5jMB85oegnjV3Rp/eBoXsDm
h4qo+5kv0h8H2wKdxcBfVg6LkpBZGsvEOveAtWZIcFIVIOyULj9UAsnTwOotwQiL
NHO4J2fJhcvSYUj6oGB3SpabKZfcbVXRE2fzZq+3+Mt4DdzSdSmx5CEJfUmxN7sQ
YLb8UKSr2vv03YfKRghCGxqjOcmQL5vY79O8+QSN3cCDFFAwxzNYaGeHJ+/chvh2
NySOkUf/uA7H1xQiZmJI1mfwQvi527MEzblCPDButm6n8ty6QyWOQ+kQYzcW5jjI
kPWdqc5pCZQ+Q+q6lQc0
=rNay
-----END PGP SIGNATURE-----
Merge tag 'v2.7.6' into maint-2.8
Git 2.7.6
2017-07-30 14:46:43 -07:00
5e0649dc65
Git 2.7.6
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-30 14:45:13 -07:00
Junio C Hamano
Jiang Xin
Changwoo Ryu
Anthony Sottile