Skip to content

Commit 3686aa1

Browse files
gitstergitster
committed
Merge branch 'maint' into tj/imap-send-remove-unused
* maint: (18123 commits) documentation fix: git difftool uses diff tools, not merge tools. Git 1.7.7.4 Makefile: add missing header file dependencies notes merge: eliminate OUTPUT macro mailmap: xcalloc mailmap_info name-rev --all: do not even attempt to describe non-commit object Git 1.7.7.3 docs: Update install-doc-quick docs: don't mention --quiet or --exit-code in git-log(1) Git 1.7.7.2 t7511: avoid use of reserved filename on Windows. clone: Quote user supplied path in a single quote pair read-cache.c: fix index memory allocation make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Git 1.7.7.1 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting gitweb: fix regression when filtering out forks Almost ready for 1.7.7.1 pack-objects: don't traverse objects unnecessarily ... Conflicts: imap-send.c
2 parents aa2577a + 1e501a7 commit 3686aa1

File tree

2,368 files changed

+444438
-56800
lines changed

Some content is hidden

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

2,368 files changed

+444438
-56800
lines changed

‎.gitattributes

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

‎.gitignore

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

0 commit comments

Comments
 (0)