Skip to content

Commit 2d11f21

Browse files
gitstergitster
committed
Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
* ko/maint: (4352 commits) git-submodule.sh: separate parens by a space to avoid confusing some shells Documentation/technical/api-diff.txt: correct name of diff_unmerge() read_gitfile_gently: use ssize_t to hold read result remove tests of always-false condition rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' Git 1.7.5.3 init/clone: remove short option -L and document --separate-git-dir do not read beyond end of malloc'd buffer git-svn: Fix git svn log --show-commit Git 1.7.5.2 provide a copy of the LGPLv2.1 test core.gitproxy configuration copy_gecos: fix not adding nlen to len when processing "&" Update draft release notes to 1.7.5.2 Documentation/git-fsck.txt: fix typo: unreadable -> unreachable send-pack: avoid deadlock on git:// push with failed pack-objects connect: let callers know if connection is a socket connect: treat generic proxy processes like ssh processes sideband_demux(): fix decl-after-stmt t3503: test cherry picking and reverting root commits ... Conflicts: diff.c
2 parents 28b9264 + 5b42477 commit 2d11f21

File tree

1,452 files changed

+144359
-35448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,452 files changed

+144359
-35448
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
* whitespace=!indent,trail,space
22
*.[ch] whitespace=indent,trail,space
3+
*.sh whitespace=indent,trail,space

‎.gitignore

Lines changed: 213 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -1,179 +1,219 @@
1-
GIT-BUILD-OPTIONS
2-
GIT-CFLAGS
3-
GIT-GUI-VARS
4-
GIT-VERSION-FILE
5-
git
6-
git-add
7-
git-add--interactive
8-
git-am
9-
git-annotate
10-
git-apply
11-
git-archimport
12-
git-archive
13-
git-bisect
14-
git-bisect--helper
15-
git-blame
16-
git-branch
17-
git-bundle
18-
git-cat-file
19-
git-check-attr
20-
git-check-ref-format
21-
git-checkout
22-
git-checkout-index
23-
git-cherry
24-
git-cherry-pick
25-
git-clean
26-
git-clone
27-
git-commit
28-
git-commit-tree
29-
git-config
30-
git-count-objects
31-
git-cvsexportcommit
32-
git-cvsimport
33-
git-cvsserver
34-
git-daemon
35-
git-diff
36-
git-diff-files
37-
git-diff-index
38-
git-diff-tree
39-
git-difftool
40-
git-difftool--helper
41-
git-describe
42-
git-fast-export
43-
git-fast-import
44-
git-fetch
45-
git-fetch--tool
46-
git-fetch-pack
47-
git-filter-branch
48-
git-fmt-merge-msg
49-
git-for-each-ref
50-
git-format-patch
51-
git-fsck
52-
git-fsck-objects
53-
git-gc
54-
git-get-tar-commit-id
55-
git-grep
56-
git-hash-object
57-
git-help
58-
git-http-fetch
59-
git-http-push
60-
git-imap-send
61-
git-index-pack
62-
git-init
63-
git-init-db
64-
git-instaweb
65-
git-log
66-
git-lost-found
67-
git-ls-files
68-
git-ls-remote
69-
git-ls-tree
70-
git-mailinfo
71-
git-mailsplit
72-
git-merge
73-
git-merge-base
74-
git-merge-index
75-
git-merge-file
76-
git-merge-tree
77-
git-merge-octopus
78-
git-merge-one-file
79-
git-merge-ours
80-
git-merge-recursive
81-
git-merge-resolve
82-
git-merge-subtree
83-
git-mergetool
84-
git-mergetool--lib
85-
git-mktag
86-
git-mktree
87-
git-name-rev
88-
git-mv
89-
git-pack-redundant
90-
git-pack-objects
91-
git-pack-refs
92-
git-parse-remote
93-
git-patch-id
94-
git-peek-remote
95-
git-prune
96-
git-prune-packed
97-
git-pull
98-
git-push
99-
git-quiltimport
100-
git-read-tree
101-
git-rebase
102-
git-rebase--interactive
103-
git-receive-pack
104-
git-reflog
105-
git-relink
106-
git-remote
107-
git-repack
108-
git-repo-config
109-
git-request-pull
110-
git-rerere
111-
git-reset
112-
git-rev-list
113-
git-rev-parse
114-
git-revert
115-
git-rm
116-
git-send-email
117-
git-send-pack
118-
git-sh-setup
119-
git-shell
120-
git-shortlog
121-
git-show
122-
git-show-branch
123-
git-show-index
124-
git-show-ref
125-
git-stage
126-
git-stash
127-
git-status
128-
git-stripspace
129-
git-submodule
130-
git-svn
131-
git-symbolic-ref
132-
git-tag
133-
git-tar-tree
134-
git-unpack-file
135-
git-unpack-objects
136-
git-update-index
137-
git-update-ref
138-
git-update-server-info
139-
git-upload-archive
140-
git-upload-pack
141-
git-var
142-
git-verify-pack
143-
git-verify-tag
144-
git-web--browse
145-
git-whatchanged
146-
git-write-tree
147-
git-core-*/?*
148-
gitk-wish
149-
gitweb/gitweb.cgi
150-
test-chmtime
151-
test-ctype
152-
test-date
153-
test-delta
154-
test-dump-cache-tree
155-
test-genrandom
156-
test-match-trees
157-
test-parse-options
158-
test-path-utils
159-
test-sha1
160-
test-sigchain
161-
common-cmds.h
1+
/GIT-BUILD-OPTIONS
2+
/GIT-CFLAGS
3+
/GIT-GUI-VARS
4+
/GIT-VERSION-FILE
5+
/bin-wrappers/
6+
/git
7+
/git-add
8+
/git-add--interactive
9+
/git-am
10+
/git-annotate
11+
/git-apply
12+
/git-archimport
13+
/git-archive
14+
/git-bisect
15+
/git-bisect--helper
16+
/git-blame
17+
/git-branch
18+
/git-bundle
19+
/git-cat-file
20+
/git-check-attr
21+
/git-check-ref-format
22+
/git-checkout
23+
/git-checkout-index
24+
/git-cherry
25+
/git-cherry-pick
26+
/git-clean
27+
/git-clone
28+
/git-commit
29+
/git-commit-tree
30+
/git-config
31+
/git-count-objects
32+
/git-cvsexportcommit
33+
/git-cvsimport
34+
/git-cvsserver
35+
/git-daemon
36+
/git-diff
37+
/git-diff-files
38+
/git-diff-index
39+
/git-diff-tree
40+
/git-difftool
41+
/git-difftool--helper
42+
/git-describe
43+
/git-fast-export
44+
/git-fast-import
45+
/git-fetch
46+
/git-fetch-pack
47+
/git-filter-branch
48+
/git-fmt-merge-msg
49+
/git-for-each-ref
50+
/git-format-patch
51+
/git-fsck
52+
/git-fsck-objects
53+
/git-gc
54+
/git-get-tar-commit-id
55+
/git-grep
56+
/git-hash-object
57+
/git-help
58+
/git-http-backend
59+
/git-http-fetch
60+
/git-http-push
61+
/git-imap-send
62+
/git-index-pack
63+
/git-init
64+
/git-init-db
65+
/git-instaweb
66+
/git-log
67+
/git-lost-found
68+
/git-ls-files
69+
/git-ls-remote
70+
/git-ls-tree
71+
/git-mailinfo
72+
/git-mailsplit
73+
/git-merge
74+
/git-merge-base
75+
/git-merge-index
76+
/git-merge-file
77+
/git-merge-tree
78+
/git-merge-octopus
79+
/git-merge-one-file
80+
/git-merge-ours
81+
/git-merge-recursive
82+
/git-merge-resolve
83+
/git-merge-subtree
84+
/git-mergetool
85+
/git-mergetool--lib
86+
/git-mktag
87+
/git-mktree
88+
/git-name-rev
89+
/git-mv
90+
/git-notes
91+
/git-pack-redundant
92+
/git-pack-objects
93+
/git-pack-refs
94+
/git-parse-remote
95+
/git-patch-id
96+
/git-peek-remote
97+
/git-prune
98+
/git-prune-packed
99+
/git-pull
100+
/git-push
101+
/git-quiltimport
102+
/git-read-tree
103+
/git-rebase
104+
/git-rebase--interactive
105+
/git-receive-pack
106+
/git-reflog
107+
/git-relink
108+
/git-remote
109+
/git-remote-http
110+
/git-remote-https
111+
/git-remote-ftp
112+
/git-remote-ftps
113+
/git-remote-fd
114+
/git-remote-ext
115+
/git-remote-testgit
116+
/git-repack
117+
/git-replace
118+
/git-repo-config
119+
/git-request-pull
120+
/git-rerere
121+
/git-reset
122+
/git-rev-list
123+
/git-rev-parse
124+
/git-revert
125+
/git-rm
126+
/git-send-email
127+
/git-send-pack
128+
/git-sh-setup
129+
/git-shell
130+
/git-shortlog
131+
/git-show
132+
/git-show-branch
133+
/git-show-index
134+
/git-show-ref
135+
/git-stage
136+
/git-stash
137+
/git-status
138+
/git-stripspace
139+
/git-submodule
140+
/git-svn
141+
/git-symbolic-ref
142+
/git-tag
143+
/git-tar-tree
144+
/git-unpack-file
145+
/git-unpack-objects
146+
/git-update-index
147+
/git-update-ref
148+
/git-update-server-info
149+
/git-upload-archive
150+
/git-upload-pack
151+
/git-var
152+
/git-verify-pack
153+
/git-verify-tag
154+
/git-web--browse
155+
/git-whatchanged
156+
/git-write-tree
157+
/git-core-*/?*
158+
/gitk-git/gitk-wish
159+
/gitweb/GITWEB-BUILD-OPTIONS
160+
/gitweb/gitweb.cgi
161+
/gitweb/static/gitweb.min.*
162+
/test-chmtime
163+
/test-ctype
164+
/test-date
165+
/test-delta
166+
/test-dump-cache-tree
167+
/test-genrandom
168+
/test-index-version
169+
/test-line-buffer
170+
/test-match-trees
171+
/test-mktemp
172+
/test-obj-pool
173+
/test-parse-options
174+
/test-path-utils
175+
/test-run-command
176+
/test-sha1
177+
/test-sigchain
178+
/test-string-pool
179+
/test-subprocess
180+
/test-svn-fe
181+
/test-treap
182+
/common-cmds.h
162183
*.tar.gz
163184
*.dsc
164185
*.deb
165-
git.spec
186+
/git.spec
166187
*.exe
167188
*.[aos]
168189
*.py[co]
169-
config.mak
170-
autom4te.cache
171-
config.cache
172-
config.log
173-
config.status
174-
config.mak.autogen
175-
config.mak.append
176-
configure
177-
tags
178-
TAGS
179-
cscope*
190+
.depend/
191+
*.gcda
192+
*.gcno
193+
*.gcov
194+
/coverage-untested-functions
195+
/cover_db/
196+
/cover_db_html/
197+
*+
198+
/config.mak
199+
/autom4te.cache
200+
/config.cache
201+
/config.log
202+
/config.status
203+
/config.mak.autogen
204+
/config.mak.append
205+
/configure
206+
/tags
207+
/TAGS
208+
/cscope*
209+
*.obj
210+
*.lib
211+
*.sln
212+
*.suo
213+
*.ncb
214+
*.vcproj
215+
*.user
216+
*.idb
217+
*.pdb
218+
/Debug/
219+
/Release/

0 commit comments

Comments
 (0)