Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1821 commits
Select commit Hold shift + click to select a range
03f536f
obstack: fix compiler warning
dscho Oct 27, 2016
8082b56
Export the preload_index() function
dscho Nov 23, 2016
a230c2a
terminal.c: guard the inclusion of inttypes.h
dscho Oct 27, 2016
e74e7b1
reset: support the experimental --stdin option
dscho Sep 7, 2016
8d537dd
cvsexportcommit: force crlf translation
virtuald Nov 2, 2016
3229998
add: use preload-index and fscache for performance
jeffhostetler Nov 22, 2016
9130318
Ensure that bin-wrappers/* targets adds `.exe` if necessary
dscho Nov 25, 2016
dc2f860
windows: clarify the need for invalidcontinue.obj
dscho Nov 29, 2016
e778da8
git: avoid calling aliased builtins via their dashed form
dscho Nov 28, 2016
1181037
t5505,t5516: create .git/branches/ when needed
dscho Nov 30, 2016
f15200c
.gitignore: improve MSVC ignore patterns
Jul 19, 2015
894050c
.gitignore: ignore library directories created by MSVC VS2008 buildsy…
Feb 23, 2015
bd4522a
.gitignore: ignore Visual Studio's temporary/generated files
dscho Oct 25, 2016
61617b0
contrib/buildsystems: fix misleading error message
Jul 19, 2015
99da8dd
contrib/buildsystems: handle quoted spaces in filenames
Jul 19, 2015
501e0b6
contrib/buildsystems: ignore gettext stuff
Feb 9, 2015
3fd0415
contrib/buildsystems: redirect errors of the dry run into a log file
Jul 19, 2015
79a7d7d
contrib/buildsystems: handle the curl library option
May 4, 2016
fe69775
contrib/buildsystems: ignore irrelevant files in Generators/
dscho Oct 26, 2016
6f9b884
contrib/buildsystems: handle libiconv, too
dscho Oct 27, 2016
33c917c
contrib/buildsystems: optionally capture the dry-run in a file
Jul 16, 2015
9cfc58d
contrib/buildsystems: handle options starting with a slash
dscho Oct 27, 2016
91d7145
contrib/buildsystems: support modern Visual Studio project definitions
dscho Oct 26, 2016
7ac9d71
contrib/buildsystems: make 'Restore NuGet Packages' work in Visual St…
dscho Nov 5, 2016
f22e924
Vcproj.pm: remove duplicate GUID
Jul 13, 2015
c630c51
Vcproj.pm: list git.exe first to be startup project
Jul 19, 2015
7db4061
Vcproj.pm: provide more GUIDs
Apr 6, 2016
826d37c
Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool
dscho Oct 25, 2016
4eac1d3
Vcproj.pm: urlencode '<' and '>' when generating VC projects
dscho Oct 25, 2016
b333821
msvc: add No_SafeExceptionHandler option
Jul 19, 2015
8768e8b
msvc: do not include inttypes.h
Apr 22, 2016
88d8517
msvc: add pragmas for common warnings
May 4, 2016
2df9c78
msvc: tell Visual Studio where we expect NuGet packages to be unpacked
dscho Nov 5, 2016
8b2538f
msvc: ignore .dll files copied into the top-level directory
dscho Nov 8, 2016
b7849b9
msvc: ignore incremental compile output
dscho Nov 8, 2016
01dabaa
msvc: fix `make test` without having to play PATH games
dscho Nov 3, 2016
f74bec0
msvc: add a Makefile target to pre-generate the VS solution
dscho Nov 28, 2016
4debf8a
Merge 'misc-vs-fixes' into HEAD
dscho Jun 8, 2018
4e21df7
poll: Use GetTickCount64 to avoid wraparound issues
shoelzer Dec 19, 2016
84b5af1
Merge 'no-dashed-invocation' into HEAD
dscho Jun 8, 2018
bd522cf
msvc: avoid debug assertion windows in Debug Mode
dscho Nov 30, 2016
5e23e0a
Support Vagrant: quick & easy Linux virtual machine setup
dscho May 25, 2015
8ce81f9
Merge branch 'git-gui'
dscho Jun 7, 2018
d1e5725
Merge branch 'long-paths'
dscho Jun 8, 2018
77cb0d3
poll: lazy-load GetTickCount64()
dscho Dec 20, 2016
3727b02
diffcore-rename: speed up register_rename_src
jeffhostetler Dec 15, 2016
db83aaf
t5580: verify that alternates can be UNC paths
dscho Jan 11, 2017
8d6a634
git-gui: correctly restore GIT_DIR after invoking gitk
max630 Jan 18, 2017
463f195
fscache: add key for GIT_TRACE_FSCACHE
jeffhostetler Jan 24, 2017
26dee4d
fscache: remember not-found directories
jeffhostetler Dec 13, 2016
7a9fb84
mingw: demonstrate a problem with certain absolute paths
dscho Apr 18, 2017
411bee8
fscache: add a test for the dir-not-found optimization
dscho Jan 25, 2017
fc0e77d
abspath_part_inside_repo: respect core.fileMode
dscho Apr 5, 2017
3cc6759
mingw: allow absolute paths without drive prefix
dscho Apr 18, 2017
eccdb6d
Merge 'readme' into HEAD
dscho Jun 7, 2018
4eee1c5
Merge 'git-gui' into HEAD
dscho Jun 7, 2018
815268e
Merge branch 'msys2-git-gui'
dscho Jun 7, 2018
8cbeb05
Merge 'gitk' into HEAD
dscho Jun 7, 2018
a0b94f2
Merge 'msys2' into HEAD
dscho Jun 8, 2018
d680d13
Merge 'win-tests-fixes' into HEAD
dscho Jun 8, 2018
be373f6
Merge 'remote-hg-prerequisites' into HEAD
dscho Jun 8, 2018
bdbf9e7
Merge 'fix-externals' into HEAD
dscho Jun 8, 2018
f7db93e
Merge 'sideband-bug' into HEAD
dscho Jun 8, 2018
383890e
Merge pull request #156 from kblees/kb/symlinks
dscho Jun 8, 2018
dbdd909
Merge pull request #443 from kblees/kb/nanosecond-file-times-v2.5.3
dscho Jun 8, 2018
6548214
Merge 'mingw-getcwd' into HEAD
dscho Jun 8, 2018
95607b8
Merge branch 'program-data-config'
dscho Jun 8, 2018
3134825
Merge pull request #305 from dscho/msysgit_issues_182
dscho Jun 8, 2018
5ed76f1
Merge pull request #773 from jeffhostetler/vs2015
dscho Jun 8, 2018
359b989
Merge pull request #552 from duncansmart/fix-vcproj-gen
dscho Jun 8, 2018
c79a238
Merge 'aslr' into HEAD
dscho Jun 8, 2018
9c71682
Merge branch 'clean-long-paths'
dscho Jun 8, 2018
e675288
Merge pull request #677 from yaras/fix-git-675
dscho Jun 8, 2018
399253b
Merge branch 'spawn-with-spaces'
dscho Jun 8, 2018
19677af
Merge 'release-gc-repack' into HEAD
dscho Jun 8, 2018
51abc1f
Merge pull request #797 from glhez/master
dscho Jun 8, 2018
66c2cd3
Merge branch 'status-no-lock-index'
dscho Jun 8, 2018
1a21fc9
Merge branch 'unhidden-git'
dscho Jun 8, 2018
65aa12d
Unbreak interactive GPG prompt upon signing
dscho Sep 6, 2016
0b3b2f7
Merge branch 'reset-stdin'
dscho Jun 8, 2018
4231912
Merge pull request #938 from virtuald/patch-1
dscho Jun 8, 2018
83fe8a1
mingw: make readlink() independent of core.symlinks
dscho Nov 16, 2016
cf316ee
Merge pull request #971 from jeffhostetler/jeffhostetler/add_preload_…
dscho Jun 8, 2018
f136115
Merge branch 'visual-studio'
dscho Jun 8, 2018
41600b5
Merge 'misc-vs-fixes-extra' into HEAD
dscho Jun 8, 2018
1962f49
Merge pull request #159 from dscho/vagrant
dscho Jun 8, 2018
ecf96c9
Merge pull request #1003 from shoelzer/master
dscho Jun 8, 2018
09003e2
Merge pull request #996 from jeffhostetler/jeffhostetler/register_ren…
dscho Jun 8, 2018
a44c373
t9116: work around hard-to-debug hangs
dscho Jan 11, 2017
a654374
t9001: work around hard-to-debug hangs
dscho Jan 11, 2017
d4b52d6
Merge branch 'test-unc-alternates'
dscho Jun 8, 2018
1240d87
Merge pull request #1032 from max630/gitgui_GIT_GIT_unset
dscho Jun 8, 2018
7722860
Merge pull request #994 from jeffhostetler/jeffhostetler/fscache_nfd
dscho Jun 8, 2018
c565b58
mingw: ensure valid CTYPE
dscho Feb 21, 2017
a27de0a
mingw: make is_hidden tests in t0001/t5611 more robust
dscho Feb 21, 2017
5d1512e
mingw: fix isatty() after dup2()
dscho Mar 2, 2017
d29c134
Merge 'case-insensitive-abspath' into HEAD
dscho Jun 8, 2018
3dd7cd5
mingw: kill child processes in a gentler way
dscho May 17, 2017
11ad70c
Merge branch 'drive-prefix'
dscho Jun 8, 2018
20482f0
Merge pull request #1170 from dscho/mingw-kill-process
dscho Jun 8, 2018
be67df0
mingw: try to create symlinks without elevated permissions
dscho May 30, 2017
1e06cfd
setup_git_directory(): handle UNC paths correctly
dscho May 29, 2017
74646a7
mingw: use proper quoting of the tr argument in t5580
dscho Jun 19, 2017
31c7088
mingw (t5580): document bug when cloning from backslashed UNC paths
dscho Jun 19, 2017
266871d
mingw: special-case arguments to `sh`
dscho Jun 19, 2017
e85f562
Merge pull request #1188 from dscho/unprivileged-symlinks
dscho Jun 8, 2018
5001f83
Merge branch 'unc-path-w-backslashes'
dscho Jun 8, 2018
08331c7
do_git_config_sequence(): fall back to git_dir if commondir is NULL
dscho Jul 13, 2017
616647b
t5580: test cloning without file://, test fetching via UNC paths
dscho Jul 13, 2017
070bdde
http: add support for selecting SSL backends at runtime
dscho Aug 2, 2017
84adeb3
http: add support for disabling SSL revocation checks in cURL
shiftkey Jan 23, 2018
103ad13
http: when using Secure Channel, ignore sslCAInfo by default
dscho Jun 14, 2018
e1f57d4
tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/
dscho Jul 21, 2017
6c14d4c
transport-helper: prefer Git's builtins over dashed form
dscho Jul 19, 2017
a348f37
Merge branch 'bw/config-h'
dscho Jun 8, 2018
ec2326f
mingw: explicitly specify with which cmd to prefix the cmdline
dscho Jul 20, 2017
2dcc144
Merge branch 'http-ssl-backend'
dscho Jun 8, 2018
9a61f74
mingw: when path_lookup() failed, try BusyBox
dscho Jul 20, 2017
539e4b2
test-run-command: learn to run (parts of) the testsuite
dscho Jul 18, 2017
b6d2465
test-lib: avoid unnecessary Perl invocation
dscho Aug 5, 2017
d4077be
tests: replace mingw_test_cmp with a helper in C
dscho Jun 7, 2018
bbaa574
test-tool: learn to act as a drop-in replacement for `iconv`
dscho Jul 20, 2017
55e088b
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho Jul 20, 2017
7f4c81d
tests: do not require Git to be built when testing an installed Git
dscho Aug 4, 2017
73f994b
tests: respect GIT_TEST_INSTALLED when initializing repositories
dscho Jul 19, 2017
585f2d6
t/lib-gettext:test installed git-sh-i18n if GIT_TEST_INSTALLED is set
dscho Jul 18, 2017
5c6004d
tests: use t/diff-lib/* consistently
dscho Aug 5, 2017
14637cc
tests: move test PNGs into t/diff-lib/
dscho Aug 5, 2017
08adfcd
tests: only override sort & find if there are usable ones in /usr/bin/
dscho Jul 17, 2017
548d093
tests: use the correct path separator with BusyBox
dscho Jul 17, 2017
10e97cb
mingw: only use Bash-ism `builtin pwd -W` when available
dscho Jun 29, 2017
2e97425
tests (mingw): remove Bash-specific pwd option
dscho Jun 30, 2017
0313139
test-lib: add BUSYBOX prerequisite
dscho Jul 19, 2017
3acb771
t0021: use Windows path when appropriate
dscho Aug 4, 2017
ca59721
t1300: mark all test cases with funny filenames as !MINGW
dscho Jul 3, 2017
8fc1e3f
t4124: avoid using "normal" diff mode
dscho Jul 5, 2017
f46c3bc
t5003: use binary file from t/diff-lib/
dscho Aug 5, 2017
0259f78
t5003: skip `unzip -a` tests with BusyBox
dscho Jul 5, 2017
a5003fb
t5532: workaround for BusyBox on Windows
dscho Jul 21, 2017
1be9a33
t5605: special-case hardlink test for BusyBox-w32
dscho Jul 21, 2017
fd3e4f8
t5813: allow for $PWD to be a Windows path
dscho Jul 5, 2017
5885acd
t7063: when running under BusyBox, avoid unsupported find option
dscho Jul 19, 2017
0781893
t9200: skip tests when $PWD contains a colon
dscho Jul 7, 2017
22541b8
t9350: skip ISO-8859-1 test when the environment is always-UTF-8
dscho Jul 8, 2017
33a6449
mingw: add a Makefile target to copy test artifacts
dscho Jul 19, 2017
220c912
Implement pthread_cond_t with Win32 CONDITION_VARIABLE
rongjiecomputer Jun 22, 2017
639460c
Format to 80 cols
rongjiecomputer Jun 23, 2017
54ae9ab
Remove old code and macro-ize implementation
rongjiecomputer Aug 15, 2017
86c40f7
Merge branch 'busybox-w32'
dscho Jun 8, 2018
f863bf8
mingw: support UNC in git clone file://server/share/repo
tboegi Aug 15, 2017
a6552b1
Merge pull request #1214 from rongjiecomputer/master
dscho Jun 8, 2018
68d2d48
packages.config: remove v120 and x86 versions
jeffhostetler Sep 15, 2017
75253f7
MSVC Build: Support VS2017 command line compiler tools
jeffhostetler Aug 17, 2017
5dfd581
Merge branch 'file-url-to-unc-path'
dscho Jun 8, 2018
96f40ee
vcxproj.pm: fix AdditionalDependencies
jeffhostetler Sep 15, 2017
c4bde51
Merge pull request #1273 from jeffhostetler/jeffhostetler/vs2017
dscho Jun 8, 2018
4636d1c
git-gui--askyesno: fix funny text wrapping
dscho Sep 20, 2017
a4cf055
git-gui--askyesno: allow overriding the window title
dscho Sep 20, 2017
13b8cec
git-gui--askyesno (mingw): use Git for Windows' icon, if available
dscho Sep 20, 2017
cfc3bf6
Merge pull request #1302 from jeffhostetler/vs2017_vcxproj
dscho Jun 8, 2018
934fda9
Merge branch 'git-gui-askyesno'
dscho Jun 8, 2018
047f39e
mingw: avoid infinite loop in rename()
dscho Sep 25, 2017
d5f557b
diff: munmap() file contents before running external diff
dscho Oct 5, 2017
10b6d6c
mingw: use CreateHardLink directly
max630 Oct 27, 2017
8ce0e69
Fix .git/ discovery at the root of UNC shares
dscho Oct 13, 2017
8544abe
Merge pull request #1334 from max630/mingw-direct-CreateHardLinkW
dscho Jun 8, 2018
ddf6a10
dir.c: make add_excludes aware of fscache during status
jeffhostetler Nov 1, 2017
28a6292
msvc: fix `make MSVC=1 install`
dscho Oct 31, 2017
e571274
Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fs…
dscho Jun 8, 2018
a1cf228
contrib/buildsystems: error out on unknown option
dscho Dec 4, 2017
e7b2602
contrib/buildsystems: redirect stderr into the correct directory
dscho Dec 4, 2017
6d42429
Mark .bat files as requiring CR/LF endings
dscho Nov 28, 2017
5ec7bce
vcpkg: get MSVC dependencies with vcpkg rather than nuget
jeffhostetler Sep 19, 2017
e404d1d
msvc: cleanup obsolete nuget files
jeffhostetler Sep 19, 2017
b4d340c
status: reinstate --show-ignored-directory as a deprecated option
dscho Nov 9, 2017
66f9198
msvc: get rid of the MSVC_DEPS variable
jeffhostetler Sep 19, 2017
69baebc
status: verify that --show-ignored-directory prints a warning
dscho Nov 9, 2017
fc12a12
vcxproj: let vcs-svn depend on libgit
dscho Nov 29, 2017
5bcc7a7
vcxproj: do not use &quot; unnecessarily
dscho Nov 29, 2017
b61cd74
vcxproj: automatically initialize the vcpkg system
dscho Nov 28, 2017
77a5b6b
vcxproj: move `vcxproj` target outside the MSVC block
dscho Dec 5, 2017
4a8e439
Allow `make vcxproj` without initializing vcpkg
dscho Dec 1, 2017
46e0c12
vcxproj: also link-or-copy builtins
dscho Dec 19, 2017
9dc7f89
Makefile: add third-party DLLs to install target
jeffhostetler Dec 8, 2017
f8da8f5
fscache: make fscache_enabled() public
jeffhostetler Dec 20, 2017
64d3ed8
Merge pull request #1354 from dscho/phase-out-show-ignored-directory-…
dscho Jun 8, 2018
93a7796
dir.c: regression fix for add_excludes with fscache
jeffhostetler Dec 20, 2017
63769c7
mingw: ensure that core.longPaths is handled *always*
dscho Aug 29, 2017
4811d9d
mingw: change core.fsyncObjectFiles = 1 by default
dscho Sep 4, 2017
4fedc46
Merge pull request #1304 from jeffhostetler/vs2017_vcpkg
dscho Jun 8, 2018
cca6dd5
Merge pull request #1407 from jeffhostetler/regression_1392
dscho Jun 8, 2018
01cfdca
Merge branch 'core-longpaths-everywhere'
dscho Jun 8, 2018
54dafee
mingw: demonstrate that all file handles are inherited by child proce…
dscho Jan 26, 2018
6273e6f
compat/poll: prepare for targeting Windows Vista
dscho Jan 25, 2018
b096a4b
Merge branch 'fsync-object-files-always'
dscho Jun 8, 2018
efcfe0c
mingw: set _WIN32_WINNT explicitly for Git for Windows
dscho Jan 25, 2018
3c23af0
Merge pull request #1426 from atetubou/fetch_pack
dscho Jun 8, 2018
5821b29
fetch-pack.c: enable fscache for stats under .git/objects
Nov 22, 2017
fea900b
mingw: bump the minimum Windows version to Vista
dscho Jan 25, 2018
cd8e004
mingw: spawned processes need to inherit only standard handles
dscho Feb 7, 2018
8f168a0
mingw: spawned processes need to inherit only standard handles
dscho Jan 26, 2018
5eb0dd0
Merge branch 'inherit-only-stdhandles'
dscho Jun 8, 2018
ef99f2f
buildsystems(vcxproj): auto-generate GUIDs
dscho Feb 16, 2018
81d4436
add --edit: truncate the patch file
dscho Feb 12, 2018
587912d
mingw (git_terminal_prompt): work around BusyBox & WSL issues
dscho Feb 23, 2018
f36a43d
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho Feb 23, 2018
7064a5d
buildsystems(Vcproj): auto-generate GUIDs
dscho Feb 16, 2018
833f330
.github: Add configuration for the Sentiment Bot
dscho Feb 20, 2018
0ef403a
mingw (git_terminal_prompt): turn on echo explictly
dscho Feb 23, 2018
9a77af7
checkout.c: enable fscache for checkout again
Jan 30, 2018
31f98a2
Merge branch 'fix-vcxproj-generation'
dscho Jun 8, 2018
b2ada6f
Merge branch 'fix-terminal-prompt'
dscho Jun 8, 2018
44ade00
Merge pull request #1468 from atetubou/fscache_checkout_flush
dscho Jun 8, 2018
d9e0532
CODE_OF_CONDUCT: Rename CONTRIBUTING.md to CODE_OF_CONDUCT.md
derrickstolee Mar 1, 2018
e05ef52
CONTRIBUTING.md: add guide for first-time contributors
derrickstolee Mar 1, 2018
b4967c8
setup_git_directory(): handle UNC root paths correctly
dscho Mar 2, 2018
2ab43ee
Merge pull request #1529 from derrickstolee/contributing
dscho Jun 8, 2018
211f3dd
Merge branch 'fix-unc-buffer-overflow'
dscho Jun 8, 2018
e1b4d0c
mingw: introduce code to detect whether we're inside a Windows container
zcube Apr 23, 2018
8784cd9
mingw: when running in a Windows container, try to rename() harder
zcube Apr 23, 2018
8c5b946
Document how $HOME is set on Windows
alejandro5042 Mar 9, 2018
afd9e5c
mingw: move the file_attr_to_st_mode() function definition
zcube Apr 23, 2018
b561362
mingw: really handle SIGINT
dscho Apr 22, 2018
e381122
Merge pull request #1548 from alejandro5042/master
dscho Jun 8, 2018
d3edca3
mingw: Windows Docker volumes are *not* symbolic links
dscho Apr 23, 2018
88ca0b6
Merge branch 'ctrl-c'
dscho Jun 8, 2018
25f1dbe
vcxproj: change build logic
telezhnaya May 15, 2018
7359c80
Merge pull request #1645 from ZCube/master
dscho Jun 8, 2018
dde6459
Merge pull request #1679 from telezhnaya/win
dscho Jun 8, 2018
1311c8c
find_vs_env.bat: Fix bin dir path used by msys
jeffhostetler Jul 25, 2018
b83d9a0
CONTRIBUTING.md: add an extra example
prertik Jul 2, 2018
37356e3
Merge pull request #1766 from jeffhostetler/gfw-msvc-bin-dir
jeffhostetler Jul 25, 2018
37334c3
Merge 'ps/stash-in-c'
dscho Aug 23, 2018
6087a83
Merge 'pk/rebase-in-c'
dscho Aug 23, 2018
9c402c6
Merge 'pk/rebase-in-c-2-basic'
dscho Aug 23, 2018
6484002
Merge 'pk/rebase-in-c-3-acts'
dscho Aug 23, 2018
5acb9db
Merge 'pk/rebase-in-c-4-opts'
dscho Aug 23, 2018
730c6b0
Add back the original, scripted interactive rebase backend
dscho Aug 24, 2018
aae9412
Merge 'pk/rebase-in-c-5-test'
dscho Aug 23, 2018
3bbaf72
non-builtin rebase: use non-builtin interactive backend
dscho Aug 24, 2018
35a94a5
Merge 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'
dscho Aug 23, 2018
02f56f3
Add back the original, scripted `git stash`
dscho Aug 24, 2018
918cabb
Merge 'pk/rebase-in-c-6-final'
dscho Aug 23, 2018
a23a00b
stash: optionally use the scripted version again
dscho Aug 24, 2018
12895c8
"fixup! builtin rebase: support `keep-empty` option"
dscho Aug 24, 2018
e59f3e6
Merge 'builtin-rebase--am'
dscho Aug 23, 2018
44439e2
stash/rebase: default to the non-builtin versions
dscho Aug 24, 2018
3b6ef0b
Merge branch 'fixups'
dscho Aug 24, 2018
e4e74cf
Merge branch 'make-builtin-stash-and-rebase-opt-ins'
dscho Aug 24, 2018
c71186e
Merge builtin-stash-rebase
jamill Aug 28, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*.perl eol=lf diff=perl
*.pl eof=lf diff=perl
*.pm eol=lf diff=perl
*.png binary
*.py eol=lf diff=python
*.bat eol=crlf
/Documentation/git-*.txt eol=lf
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@
/git-init-db
/git-interpret-trailers
/git-instaweb
/git-legacy-rebase
/git-legacy-rebase--interactive
/git-legacy-stash
/git-log
/git-ls-files
/git-ls-remote
Expand Down Expand Up @@ -113,12 +116,14 @@
/git-pull
/git-push
/git-quiltimport
/git-range-diff
/git-read-tree
/git-rebase
/git-rebase--am
/git-rebase--helper
/git-rebase--common
/git-rebase--interactive
/git-rebase--merge
/git-rebase--preserve-merges
/git-receive-pack
/git-reflog
/git-remote
Expand Down Expand Up @@ -242,6 +247,7 @@
/config.mak.autogen
/config.mak.append
/configure
/.vscode/
/tags
/TAGS
/cscope*
Expand Down
11 changes: 10 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
Christopher Díaz Riveros <chrisadr@gentoo.org> Christopher Diaz Riveros
Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
Dan Johnson <computerdruid@gmail.com>
Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
Dana L. How <danahow@gmail.com> Dana How
Daniel Barkalow <barkalow@iabervon.org>
Daniel Knittl-Frank <knittl89@googlemail.com> knittl
Daniel Trstenjak <daniel.trstenjak@gmail.com> <daniel.trstenjak@online.de>
Daniel Trstenjak <daniel.trstenjak@gmail.com> <trsten@science-computing.de>
David Brown <git@davidb.org> <davidb@quicinc.com>
Expand All @@ -57,6 +59,7 @@ Eric S. Raymond <esr@thyrsus.com>
Eric Wong <e@80x24.org> <normalperson@yhbt.net>
Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
Fangyi Zhou <fangyi.zhou@yuriko.moe> Zhou Fangyi
Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
Expand Down Expand Up @@ -86,6 +89,8 @@ Jason McMullan <mcmullan@netapp.com>
Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
Jean-Noël Avila <jn.avila@free.fr> Jean-Noel Avila
Jean-Noël Avila <jn.avila@free.fr> Jean-Noël AVILA
Jeff King <peff@peff.net> <peff@github.com>
Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
Expand Down Expand Up @@ -149,6 +154,7 @@ Matt Draisey <matt@draisey.ca> <mattdraisey@sympatico.ca>
Matt Kraai <kraai@ftbfs.org> <matt.kraai@amo.abbott.com>
Matt McCutchen <matt@mattmccutchen.net> <hashproduct@gmail.com>
Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
Matthias Rüster <matthias.ruester@gmail.com> Matthias Ruester
Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
Michael Coleman <tutufan@gmail.com>
Expand Down Expand Up @@ -213,6 +219,8 @@ Sean Estabrooks <seanlkml@sympatico.ca>
Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
Seth Falcon <seth@userprimary.net> <sfalcon@fhcrc.org>
Shawn O. Pearce <spearce@spearce.org>
Wei Shuyu <wsy@dogben.com> Shuyu Wei
Sidhant Sharma <tigerkid001@gmail.com> Sidhant Sharma [:tk]
Simon Hausmann <hausmann@kde.org> <simon@lst.de>
Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com>
Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com>
Expand Down Expand Up @@ -253,7 +261,8 @@ Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <ukleinek@informatik.uni-frei
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <uzeisberger@io.fsforth.de>
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <zeisberg@informatik.uni-freiburg.de>
Ville Skyttä <ville.skytta@iki.fi> <scop@xemacs.org>
Vitaly "_Vi" Shukela <public_vi@tut.by>
Vitaly "_Vi" Shukela <vi0oss@gmail.com> <public_vi@tut.by>
Vitaly "_Vi" Shukela <vi0oss@gmail.com> Vitaly _Vi Shukela
W. Trevor King <wking@tremily.us> <wking@drexel.edu>
William Pursell <bill.pursell@gmail.com>
YONETANI Tomokazu <y0n3t4n1@gmail.com> <qhwt+git@les.ath.cx>
Expand Down
1 change: 1 addition & 0 deletions Documentation/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ cmds-*.txt
mergetools-*.txt
manpage-base-url.xsl
SubmittingPatches.txt
tmp-doc-diff/
1 change: 1 addition & 0 deletions Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ TECH_DOCS += technical/long-running-process-protocol
TECH_DOCS += technical/pack-format
TECH_DOCS += technical/pack-heuristics
TECH_DOCS += technical/pack-protocol
TECH_DOCS += technical/partial-clone
TECH_DOCS += technical/protocol-capabilities
TECH_DOCS += technical/protocol-common
TECH_DOCS += technical/protocol-v2
Expand Down
Loading