global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-07 08:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,636 Commits 6 Branches 1,000 Tags
12980c32d607acac2eb47e7903cf242e9fd70886
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
dscho 12980c32d6 Merge pull request #220 from lchiocca/master 
The stat() method should not be dependent on the core.symlinks config entry
2015-07-17 15:47:50 +02:00
block-sha1
…
builtin
Merge 'non-win-fixes' into HEAD
2015-06-25 23:17:57 +02:00
compat
Merge branch 'program-data-config'
2015-06-25 23:18:03 +02:00
contrib
wincred: handle empty username/password correctly
2015-06-25 23:09:32 +02:00
Documentation
Merge branch 'program-data-config'
2015-06-25 23:18:03 +02:00
ewah
Merge branch 'jk/pack-bitmap' into maint
2015-03-05 13:13:02 -08:00
git-gui
Merge 'msys2' into HEAD
2015-06-25 23:17:55 +02:00
gitk-git
Merge 'gitk' into HEAD
2015-06-25 23:17:54 +02:00
gitweb
gitweb (SyntaxHighlighter): interpret #l<line-number>
2015-03-24 11:23:50 +01:00
mergetools
mergetools: stop setting $status in merge_cmd()
2014-11-21 11:27:53 -08:00
perl
Git.pm: stop assuming that absolute paths start with a slash
2015-06-25 23:09:43 +02:00
po
l10n: de.po: translation fix for fall-back to 3way merge
2015-06-12 20:40:04 +02:00
ppc
…
t
Merge pull request #228 from tboegi/150630_git-for-windows-update-t0027
2015-07-01 16:20:21 +02:00
templates
pre-push.sample: remove unnecessary and misleading IFS=' '
2014-12-22 10:27:42 -08:00
vcs-svn
…
xdiff
…
.gitattributes
…
.gitignore
Support Vagrant: quick & easy Linux virtual machine setup
2015-06-25 23:17:59 +02:00
.mailmap
Update mailmap to spell out "Alexander Kuleshov"
2015-03-27 12:58:18 -07:00
abspath.c
…
aclocal.m4
…
advice.c
standardize usage info string format
2015-01-14 09:32:04 -08:00
advice.h
…
alias.c
…
alloc.c
…
archive-tar.c
…
archive-zip.c
Merge branch 'rs/zip-text'
2015-03-17 16:01:27 -07:00
archive.c
standardize usage info string format
2015-01-14 09:32:04 -08:00
archive.h
…
argv-array.c
…
argv-array.h
…
attr.c
Merge branch 'pt/xdg-config-path' into maint
2015-06-05 12:00:04 -07:00
attr.h
…
base85.c
…
bisect.c
Merge branch 'jc/merge-bases'
2015-01-07 12:55:05 -08:00
bisect.h
…
blob.c
…
blob.h
…
branch.c
ref_transaction_update(): remove "have_old" parameter
2015-02-17 11:22:50 -08:00
branch.h
…
builtin.h
…
bulk-checkin.c
Merge branch 'rs/deflate-init-cleanup' into maint
2015-03-23 11:23:38 -07:00
bulk-checkin.h
…
bundle.c
bundle.c: fix memory leak
2015-03-10 20:53:52 -07:00
bundle.h
…
cache-tree.c
…
cache-tree.h
…
cache.h
Win32: support long paths
2015-06-25 23:09:37 +02:00
check_bindir
…
check-builtins.sh
check-builtins: strip executable suffix $X when enumerating builtins
2015-02-05 12:03:27 -08:00
check-racy.c
…
color.c
parse_color: fix return value for numeric color values 0-8
2015-01-20 15:56:03 -08:00
color.h
parse_color: recognize "no$foo" to clear the $foo attribute
2014-11-20 12:42:55 -08:00
column.c
…
column.h
…
combine-diff.c
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
2015-05-27 13:54:42 -07:00
command-list.txt
…
commit-slab.h
…
commit.c
Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint
2015-06-25 11:02:10 -07:00
commit.h
Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint
2015-06-25 11:02:10 -07:00
config.c
config.c: fix writing config files on Windows network shares
2015-06-30 16:54:22 +02:00
config.mak.in
…
config.mak.uname
mingw: Use the Git wrapper for builtins
2015-06-25 23:13:37 +02:00
configure.ac
Makefile: do not depend on curl-config
2015-06-25 23:13:33 +02:00
connect.c
Merge branch 'bc/connect-plink' into maint
2015-06-05 12:00:11 -07:00
connect.h
…
connected.c
…
connected.h
…
convert.c
…
convert.h
…
copy.c
…
COPYING
…
credential-cache--daemon.c
…
credential-cache.c
…
credential-store.c
Merge branch 'pt/xdg-config-path' into maint
2015-06-05 12:00:04 -07:00
credential.c
Merge branch 'jk/credential-quit'
2014-12-22 12:27:20 -08:00
credential.h
credential: let helpers tell us to quit
2014-12-04 10:11:12 -08:00
csum-file.c
sha1fd_check: die when we cannot open the file
2015-03-19 13:35:15 -07:00
csum-file.h
Merge branch 'jk/pack-bitmap'
2014-12-12 14:31:42 -08:00
ctype.c
kwset: use unsigned char to store values with high-bit set
2015-03-02 12:32:24 -08:00
daemon.c
daemon: unbreak NO_IPV6 build regression
2015-05-05 11:03:24 -07:00
date.c
Merge branch 'jc/epochtime-wo-tz' into maint-2.3
2015-05-11 14:33:58 -07:00
decorate.c
…
decorate.h
…
delta.h
…
diff-delta.c
…
diff-lib.c
run_diff_files(): clarify computation of sha1 validity
2015-02-04 14:27:01 -08:00
diff-no-index.c
diff-no-index: align D/F handling with that of normal Git
2015-03-26 14:08:43 -07:00
diff.c
Merge branch 'jk/color-diff-plain-is-context' into maint
2015-06-25 11:02:11 -07:00
diff.h
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
2015-05-27 13:54:42 -07:00
diffcore-break.c
…
diffcore-delta.c
…
diffcore-order.c
…
diffcore-pickaxe.c
…
diffcore-rename.c
Merge branch 'jk/diffcore-rename-duplicate' into maint
2015-03-13 22:56:08 -07:00
diffcore.h
…
dir.c
Merge branch 'rs/janitorial' into maint
2015-06-16 14:33:47 -07:00
dir.h
Merge branch 'jc/report-path-error-to-dir' into maint
2015-03-31 14:53:08 -07:00
editor.c
…
entry.c
…
environment.c
Win32: support long paths
2015-06-25 23:09:37 +02:00
exec_cmd.c
Merge branch 'jk/git-no-more-argv0-path-munging' into maint
2015-05-26 13:49:18 -07:00
exec_cmd.h
system_path(): always return free'able memory to the caller
2014-11-30 16:39:47 -08:00
fast-import.c
Merge branch 'rs/deflate-init-cleanup' into maint
2015-03-23 11:23:38 -07:00
fetch-pack.c
fetch-pack: remove dead assignment to ref->new_sha1
2015-03-19 14:11:52 -07:00
fetch-pack.h
…
fmt-merge-msg.h
…
fsck.c
Merge branch 'js/fsck-tag-validation'
2014-12-22 12:27:41 -08:00
fsck.h
…
generate-cmdlist.sh
…
gettext.c
gettext: always use UTF-8 on native Windows
2015-06-25 23:09:46 +02:00
gettext.h
Merge branch 'ye/http-accept-language'
2015-03-06 15:02:25 -08:00
git-add--interactive.perl
Merge branch 'ak/add-i-empty-candidates' into maint
2015-02-24 22:10:42 -08:00
git-am.sh
am: Use cat instead of echo to avoid DOS line-endings (fixes t4150)
2015-06-25 23:09:45 +02:00
git-archimport.perl
…
git-bisect.sh
standardize usage info string format
2015-01-14 09:32:04 -08:00
git-compat-util.h
Merge branch 'program-data-config'
2015-06-25 23:18:03 +02:00
git-cvsexportcommit.perl
…
git-cvsimport.perl
…
git-cvsserver.perl
…
git-difftool--helper.sh
difftool--helper: add explicit exit statement
2014-11-21 11:27:53 -08:00
git-difftool.perl
…
git-filter-branch.sh
filter-branch: avoid passing commit message through sed
2015-04-29 10:01:04 -07:00
git-instaweb.sh
git-instaweb: use @SHELL_PATH@ instead of /bin/sh
2015-03-10 15:10:35 -07:00
git-merge-octopus.sh
Windows: make sure that merge-octopus only outputs LF line endings
2015-06-25 23:09:45 +02:00
git-merge-one-file.sh
…
git-merge-resolve.sh
…
git-mergetool--lib.sh
mergetool--lib: remove use of $status global
2014-11-21 11:27:53 -08:00
git-mergetool.sh
mergetool: simplify conditionals
2014-11-21 11:27:53 -08:00
git-p4.py
Merge branch 'ld/p4-submit-hint'
2015-02-11 13:39:44 -08:00
git-parse-remote.sh
…
git-pull.sh
Teach 'git pull' to handle --rebase=interactive
2015-06-25 23:09:33 +02:00
git-quiltimport.sh
…
git-rebase--am.sh
…
git-rebase--interactive.sh
Merge branch 'mm/rebase-i-post-rewrite-exec' into maint
2015-06-25 11:02:09 -07:00
git-rebase--merge.sh
…
git-rebase.sh
Merge branch 'jk/rebase-quiet-noop' into maint
2015-05-26 13:49:23 -07:00
git-relink.perl
…
git-remote-testgit.sh
transport-helper: do not request symbolic refs to remote helpers
2015-01-21 22:46:59 -08:00
git-request-pull.sh
…
git-send-email.perl
Merge branch 'km/send-email-getopt-long-workarounds'
2015-03-03 14:37:03 -08:00
git-sh-i18n.sh
…
git-sh-setup.sh
mingw: Fix submodule tests t7400, t7405, t7406
2015-06-25 23:13:28 +02:00
git-stash.sh
Merge branch 'jk/stash-options' into maint
2015-06-16 14:33:43 -07:00
git-submodule.sh
mingw: Fix submodule tests t7400, t7405, t7406
2015-06-25 23:13:28 +02:00
git-svn.perl
git-svn: lazy load some modules
2015-02-26 20:19:21 +00:00
GIT-VERSION-GEN
Git 2.4.5
2015-06-25 11:03:05 -07:00
git-web--browse.sh
…
git.c
Merge branch 'ak/git-done-help-cleanup' into maint
2015-03-23 11:23:35 -07:00
git.rc
mingw: Embed a manifest to trick UAC into Doing The Right Thing
2015-06-25 23:09:44 +02:00
git.spec.in
…
gpg-interface.c
…
gpg-interface.h
…
graph.c
…
graph.h
…
grep.c
Merge branch 'jk/blame-commit-label' into maint
2015-02-24 22:09:54 -08:00
grep.h
…
hashmap.c
…
hashmap.h
…
help.c
help: correct behavior for is_executable on Windows
2015-06-25 23:13:31 +02:00
help.h
…
hex.c
Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint
2015-03-05 13:12:55 -08:00
http-backend.c
http-backend: spool ref negotiation requests to buffer
2015-05-25 20:43:18 -07:00
http-fetch.c
…
http-push.c
Merge branch 'sb/leaks'
2015-03-27 13:02:32 -07:00
http-walker.c
…
http.c
Merge 'non-win-fixes' into HEAD
2015-06-25 23:17:57 +02:00
http.h
http.c: make finish_active_slot() and handle_curl_result() static
2015-01-15 11:00:52 -08:00
ident.c
…
imap-send.c
Only use CURLOPT_LOGIN_OPTIONS if it is actually available
2015-06-25 23:13:33 +02:00
INSTALL
…
khash.h
…
kwset.c
kwset: use unsigned char to store values with high-bit set
2015-03-02 12:32:24 -08:00
kwset.h
kwset: use unsigned char to store values with high-bit set
2015-03-02 12:32:24 -08:00
levenshtein.c
…
levenshtein.h
…
LGPL-2.1
…
line-log.c
Merge branch 'jk/color-diff-plain-is-context' into maint
2015-06-25 11:02:11 -07:00
line-log.h
line-log.c: make line_log_data_init() static
2015-01-15 11:05:47 -08:00
line-range.c
…
line-range.h
…
list-objects.c
Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint
2015-06-25 11:02:10 -07:00
list-objects.h
…
ll-merge.c
…
ll-merge.h
…
lockfile.c
lockfile.c: use is_dir_sep() instead of hardcoded '/' checks
2015-06-25 23:15:59 +02:00
lockfile.h
…
log-tree.c
log: do not shorten decoration names too early
2015-05-13 12:40:57 -07:00
log-tree.h
…
mailmap.c
mailmap: use higher level string list functions
2014-12-04 15:10:21 -08:00
mailmap.h
…
Makefile
Merge 'git-wrapper' into HEAD
2015-06-25 23:17:58 +02:00
match-trees.c
…
merge-blobs.c
merge-blobs.c: fix a memleak
2015-03-23 11:12:58 -07:00
merge-blobs.h
…
merge-recursive.c
use file_exists() to check if a file exists in the worktree
2015-05-20 13:49:10 -07:00
merge-recursive.h
…
merge.c
…
mergesort.c
…
mergesort.h
…
name-hash.c
…
notes-cache.c
…
notes-cache.h
…
notes-merge.c
Merge branch 'jc/merge-bases'
2015-01-07 12:55:05 -08:00
notes-merge.h
…
notes-utils.c
use strbuf_complete_line() for adding a newline if needed
2014-12-12 11:23:45 -08:00
notes-utils.h
…
notes.c
Merge branch 'jk/blame-commit-label' into maint
2015-02-24 22:09:54 -08:00
notes.h
…
object.c
Merge branch 'jk/type-from-string-gently' into maint
2015-05-13 14:05:54 -07:00
object.h
…
pack-bitmap-write.c
Merge branch 'jk/pack-bitmap'
2014-12-12 14:31:42 -08:00
pack-bitmap.c
Merge branch 'sb/test-bitmap-free-at-end' into maint
2015-06-16 14:33:47 -07:00
pack-bitmap.h
pack-bitmap.c: make pack_bitmap_filename() static
2015-01-15 11:04:10 -08:00
pack-check.c
…
pack-objects.c
…
pack-objects.h
…
pack-revindex.c
Silence GCC's "cast of pointer to integer of a different size" warning
2015-06-25 23:13:34 +02:00
pack-revindex.h
…
pack-write.c
…
pack.h
…
pager.c
Merge branch 'jk/decimal-width-for-uintmax' into maint
2015-03-05 13:12:59 -08:00
parse-options-cb.c
…
parse-options.c
…
parse-options.h
Merge branch 'iu/fix-parse-options-h-comment' into maint
2015-04-21 12:12:20 -07:00
patch-delta.c
…
patch-ids.c
…
patch-ids.h
…
path.c
Merge branch 'pt/xdg-config-path' into maint
2015-06-05 12:00:04 -07:00
pathspec.c
…
pathspec.h
…
pkt-line.c
pkt-line: allow writing of LARGE_PACKET_MAX buffers
2014-12-10 13:09:21 -08:00
pkt-line.h
…
preload-index.c
add infrastructure for read-only file system level caches
2015-06-25 23:09:36 +02:00
pretty.c
Merge branch 'rs/simple-cleanups' into maint
2015-03-06 14:57:57 -08:00
prio-queue.c
…
prio-queue.h
…
progress.c
…
progress.h
…
prompt.c
prompt.c: remove git_getpass() nobody uses
2015-01-15 11:02:06 -08:00
prompt.h
prompt.c: remove git_getpass() nobody uses
2015-01-15 11:02:06 -08:00
quote.c
ls-tree: remove path filtering logic in show_tree
2014-12-01 11:32:34 -08:00
quote.h
ls-tree: remove path filtering logic in show_tree
2014-12-01 11:32:34 -08:00
reachable.c
reachable: only mark local objects as recent
2015-04-20 13:09:27 -07:00
reachable.h
…
read-cache.c
Merge branch 'jk/diagnose-config-mmap-failure' into maint
2015-06-25 11:02:11 -07:00
README
…
README.md
readme: added link to governance model
2015-06-25 23:13:32 +02:00
reflog-walk.c
…
reflog-walk.h
…
refs.c
Merge branch 'mh/write-refs-sooner-2.4' into maint
2015-06-05 12:00:17 -07:00
refs.h
refs.h: remove duplication in function docstrings
2015-02-17 11:25:18 -08:00
RelNotes
Git 2.4.5
2015-06-25 11:03:05 -07:00
remote-curl.c
Merge branch 'rs/deflate-init-cleanup' into maint
2015-03-23 11:23:38 -07:00
remote-testsvn.c
…
remote.c
Merge branch 'jk/blame-commit-label' into maint
2015-02-24 22:09:54 -08:00
remote.h
Merge branch 'jc/unused-symbols'
2015-02-11 13:44:07 -08:00
replace_object.c
…
rerere.c
Merge branch 'jk/rerere-forget-check-enabled' into maint
2015-06-05 12:00:25 -07:00
rerere.h
…
resolve-undo.c
…
resolve-undo.h
…
revision.c
Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint
2015-06-25 11:02:10 -07:00
revision.h
Merge branch 'jc/unused-symbols'
2015-02-11 13:44:07 -08:00
run-command.c
Merge branch 'jk/run-command-capture'
2015-03-25 12:54:27 -07:00
run-command.h
run-command: introduce capture_command helper
2015-03-22 21:38:31 -07:00
send-pack.c
Config option to disable side-band-64k for transport
2015-06-25 23:13:32 +02:00
send-pack.h
send-pack.c: add --atomic command line argument
2015-01-07 19:56:44 -08:00
sequencer.c
Merge branch 'mg/sequencer-commit-messages-always-verbatim'
2015-03-17 16:01:32 -07:00
sequencer.h
…
server-info.c
update-server-info: create info/* with mode 0666
2015-01-06 13:46:52 -08:00
setup.c
setup_git_directory: delay core.bare/core.worktree errors
2015-05-29 09:27:27 -07:00
sh-i18n--envsubst.c
…
sha1_file.c
Silence GCC's "cast of pointer to integer of a different size" warning
2015-06-25 23:13:34 +02:00
sha1_name.c
use file_exists() to check if a file exists in the worktree
2015-05-20 13:49:10 -07:00
sha1-array.c
…
sha1-array.h
…
sha1-lookup.c
…
sha1-lookup.h
…
shallow.c
Merge branch 'jk/blame-commit-label' into maint
2015-02-24 22:09:54 -08:00
shell.c
…
shortlog.h
…
show-index.c
…
sideband.c
…
sideband.h
…
sigchain.c
…
sigchain.h
…
split-index.c
…
split-index.h
…
strbuf.c
strbuf_readlink: support link targets that exceed PATH_MAX
2015-06-25 23:15:58 +02:00
strbuf.h
strbuf.h: group documentation for trim functions
2015-01-16 14:40:47 -08:00
streaming.c
Merge branch 'sb/plug-streaming-leak'
2015-04-14 11:49:09 -07:00
streaming.h
…
string-list.c
Merge branch 'sb/string-list'
2014-12-22 12:27:30 -08:00
string-list.h
Merge branch 'sb/string-list'
2014-12-22 12:27:30 -08:00
submodule.c
use file_exists() to check if a file exists in the worktree
2015-05-20 13:49:10 -07:00
submodule.h
…
symlinks.c
…
tag.c
…
tag.h
…
tar.h
…
test-chmtime.c
…
test-config.c
…
test-ctype.c
…
test-date.c
…
test-delta.c
…
test-dump-cache-tree.c
…
test-dump-split-index.c
…
test-genrandom.c
…
test-hashmap.c
Merge branch 'js/test-hashmap-squelch-gcc'
2014-12-22 12:27:46 -08:00
test-index-version.c
…
test-line-buffer.c
…
test-match-trees.c
…
test-mergesort.c
…
test-mktemp.c
…
test-parse-options.c
…
test-path-utils.c
…
test-prio-queue.c
…
test-read-cache.c
…
test-regex.c
…
test-revision-walking.c
…
test-run-command.c
…
test-scrap-cache-tree.c
…
test-sha1-array.c
…
test-sha1.c
…
test-sha1.sh
…
test-sigchain.c
…
test-string-list.c
…
test-subprocess.c
…
test-svn-fe.c
…
test-urlmatch-normalization.c
…
test-wildmatch.c
…
thread-utils.c
thread-utils.c: detect CPU count on older BSD-like systems
2015-03-10 15:13:28 -07:00
thread-utils.h
…
trace.c
configure.ac: check for clock_gettime and CLOCK_MONOTONIC
2015-01-09 15:33:39 -08:00
trace.h
…
trailer.c
trailer: use capture_command
2015-03-22 21:39:18 -07:00
trailer.h
…
transport-helper.c
Always auto-gc after calling a fast-import transport
2015-06-25 23:13:29 +02:00
transport.c
Merge branch 'jk/fetch-pack' into maint
2015-03-28 09:33:08 -07:00
transport.h
push.c: add an --atomic argument
2015-01-07 19:56:44 -08:00
tree-diff.c
…
tree-walk.c
…
tree-walk.h
…
tree.c
Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint
2015-06-25 11:02:10 -07:00
tree.h
Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint
2015-06-25 11:02:10 -07:00
unicode_width.h
…
unimplemented.sh
…
unix-socket.c
…
unix-socket.h
…
unpack-trees.c
Sync with v2.2.1
2014-12-18 12:30:53 -08:00
unpack-trees.h
…
update_unicode.sh
update_unicode.sh: delete the command group
2014-12-22 10:03:37 -08:00
upload-pack.c
Merge branch 'jk/smart-http-hide-refs' into maint
2015-03-27 13:00:21 -07:00
url.c
…
url.h
…
urlmatch.c
urlmatch.c: make match_urls() static
2015-01-15 11:05:48 -08:00
urlmatch.h
urlmatch.c: make match_urls() static
2015-01-15 11:05:48 -08:00
usage.c
…
userdiff.c
do not include the same header twice
2015-02-13 13:16:12 -08:00
userdiff.h
…
utf8.c
utf8-bom: introduce skip_utf8_bom() helper
2015-04-16 11:35:06 -07:00
utf8.h
utf8-bom: introduce skip_utf8_bom() helper
2015-04-16 11:35:06 -07:00
Vagrantfile
Vagrantfile: Remove the comment about Ubuntu Precise
2015-07-09 14:59:21 +02:00
varint.c
…
varint.h
…
version.c
…
version.h
…
versioncmp.c
versionsort: support reorder prerelease suffixes
2015-02-27 13:38:22 -08:00
walker.c
Merge branch 'jk/blame-commit-label' into maint
2015-02-24 22:09:54 -08:00
walker.h
…
wildmatch.c
…
wildmatch.h
…
wrap-for-bin.sh
Facilitate debugging Git executables in tests with gdb
2015-06-25 23:13:34 +02:00
wrapper.c
Merge branch 'jc/max-io-size-and-ssize-max'
2015-02-25 15:40:13 -08:00
write_or_die.c
…
ws.c
…
wt-status.c
Merge branch 'sb/plug-wt-shortstatus-tracking-leak'
2015-04-14 11:49:07 -07:00
wt-status.h
wt-status: refactor detached HEAD analysis
2015-03-06 11:52:35 -08:00
xdiff-interface.c
…
xdiff-interface.h
…
zlib.c
zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}
2015-03-05 15:46:03 -08:00

README.md

Git for Windows

Join the chat at https://gitter.im/git-for-windows/git

This is the source code of Git for Windows, forked from Git.

This project is run by a governance model. If you encounter problems, you can report them as GitHub issues, discuss them on Git for Windows' Google Group, and contribute bug fixes.

Reference in New Issue View Git Blame Copy Permalink
Description
No description provided
Readme 652 MiB
Languages
C 50.5%
Shell 38.8%
Perl 4.4%
Tcl 3.2%
Python 0.8%
Other 2.1%