-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
2,368 changed files
with
444,438 additions
and
56,800 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| * whitespace=!indent,trail,space | ||
| *.[ch] whitespace=indent,trail,space | ||
| *.sh whitespace=indent,trail,space |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,135 +1,226 @@ | ||
| GIT-VERSION-FILE | ||
| git | ||
| git-add | ||
| git-am | ||
| git-annotate | ||
| git-apply | ||
| git-applymbox | ||
| git-applypatch | ||
| git-archimport | ||
| git-bisect | ||
| git-branch | ||
| git-cat-file | ||
| git-check-ref-format | ||
| git-checkout | ||
| git-checkout-index | ||
| git-cherry | ||
| git-cherry-pick | ||
| git-clone | ||
| git-clone-pack | ||
| git-commit | ||
| git-commit-tree | ||
| git-convert-objects | ||
| git-count-objects | ||
| git-cvsexportcommit | ||
| git-cvsimport | ||
| git-cvsserver | ||
| git-daemon | ||
| git-diff | ||
| git-diff-files | ||
| git-diff-index | ||
| git-diff-stages | ||
| git-diff-tree | ||
| git-describe | ||
| git-fetch | ||
| git-fetch-pack | ||
| git-findtags | ||
| git-fmt-merge-msg | ||
| git-format-patch | ||
| git-fsck-objects | ||
| git-get-tar-commit-id | ||
| git-grep | ||
| git-hash-object | ||
| git-http-fetch | ||
| git-http-push | ||
| git-imap-send | ||
| git-index-pack | ||
| git-init-db | ||
| git-local-fetch | ||
| git-log | ||
| git-lost-found | ||
| git-ls-files | ||
| git-ls-remote | ||
| git-ls-tree | ||
| git-mailinfo | ||
| git-mailsplit | ||
| git-merge | ||
| git-merge-base | ||
| git-merge-index | ||
| git-merge-tree | ||
| git-merge-octopus | ||
| git-merge-one-file | ||
| git-merge-ours | ||
| git-merge-recursive | ||
| git-merge-resolve | ||
| git-merge-stupid | ||
| git-mktag | ||
| git-mktree | ||
| git-name-rev | ||
| git-mv | ||
| git-pack-redundant | ||
| git-pack-objects | ||
| git-parse-remote | ||
| git-patch-id | ||
| git-peek-remote | ||
| git-prune | ||
| git-prune-packed | ||
| git-pull | ||
| git-push | ||
| git-read-tree | ||
| git-rebase | ||
| git-receive-pack | ||
| git-relink | ||
| git-repack | ||
| git-repo-config | ||
| git-request-pull | ||
| git-rerere | ||
| git-reset | ||
| git-resolve | ||
| git-rev-list | ||
| git-rev-parse | ||
| git-revert | ||
| git-rm | ||
| git-send-email | ||
| git-send-pack | ||
| git-sh-setup | ||
| git-shell | ||
| git-shortlog | ||
| git-show | ||
| git-show-branch | ||
| git-show-index | ||
| git-ssh-fetch | ||
| git-ssh-pull | ||
| git-ssh-push | ||
| git-ssh-upload | ||
| git-status | ||
| git-stripspace | ||
| git-svnimport | ||
| git-symbolic-ref | ||
| git-tag | ||
| git-tar-tree | ||
| git-unpack-file | ||
| git-unpack-objects | ||
| git-update-index | ||
| git-update-ref | ||
| git-update-server-info | ||
| git-upload-pack | ||
| git-var | ||
| git-verify-pack | ||
| git-verify-tag | ||
| git-whatchanged | ||
| git-write-tree | ||
| git-core-*/?* | ||
| test-date | ||
| test-delta | ||
| common-cmds.h | ||
| /GIT-BUILD-OPTIONS | ||
| /GIT-CFLAGS | ||
| /GIT-LDFLAGS | ||
| /GIT-GUI-VARS | ||
| /GIT-VERSION-FILE | ||
| /bin-wrappers/ | ||
| /git | ||
| /git-add | ||
| /git-add--interactive | ||
| /git-am | ||
| /git-annotate | ||
| /git-apply | ||
| /git-archimport | ||
| /git-archive | ||
| /git-bisect | ||
| /git-bisect--helper | ||
| /git-blame | ||
| /git-branch | ||
| /git-bundle | ||
| /git-cat-file | ||
| /git-check-attr | ||
| /git-check-ref-format | ||
| /git-checkout | ||
| /git-checkout-index | ||
| /git-cherry | ||
| /git-cherry-pick | ||
| /git-clean | ||
| /git-clone | ||
| /git-commit | ||
| /git-commit-tree | ||
| /git-config | ||
| /git-count-objects | ||
| /git-cvsexportcommit | ||
| /git-cvsimport | ||
| /git-cvsserver | ||
| /git-daemon | ||
| /git-diff | ||
| /git-diff-files | ||
| /git-diff-index | ||
| /git-diff-tree | ||
| /git-difftool | ||
| /git-difftool--helper | ||
| /git-describe | ||
| /git-fast-export | ||
| /git-fast-import | ||
| /git-fetch | ||
| /git-fetch-pack | ||
| /git-filter-branch | ||
| /git-fmt-merge-msg | ||
| /git-for-each-ref | ||
| /git-format-patch | ||
| /git-fsck | ||
| /git-fsck-objects | ||
| /git-gc | ||
| /git-get-tar-commit-id | ||
| /git-grep | ||
| /git-hash-object | ||
| /git-help | ||
| /git-http-backend | ||
| /git-http-fetch | ||
| /git-http-push | ||
| /git-imap-send | ||
| /git-index-pack | ||
| /git-init | ||
| /git-init-db | ||
| /git-instaweb | ||
| /git-log | ||
| /git-lost-found | ||
| /git-ls-files | ||
| /git-ls-remote | ||
| /git-ls-tree | ||
| /git-mailinfo | ||
| /git-mailsplit | ||
| /git-merge | ||
| /git-merge-base | ||
| /git-merge-index | ||
| /git-merge-file | ||
| /git-merge-tree | ||
| /git-merge-octopus | ||
| /git-merge-one-file | ||
| /git-merge-ours | ||
| /git-merge-recursive | ||
| /git-merge-resolve | ||
| /git-merge-subtree | ||
| /git-mergetool | ||
| /git-mergetool--lib | ||
| /git-mktag | ||
| /git-mktree | ||
| /git-name-rev | ||
| /git-mv | ||
| /git-notes | ||
| /git-pack-redundant | ||
| /git-pack-objects | ||
| /git-pack-refs | ||
| /git-parse-remote | ||
| /git-patch-id | ||
| /git-peek-remote | ||
| /git-prune | ||
| /git-prune-packed | ||
| /git-pull | ||
| /git-push | ||
| /git-quiltimport | ||
| /git-read-tree | ||
| /git-rebase | ||
| /git-rebase--am | ||
| /git-rebase--interactive | ||
| /git-rebase--merge | ||
| /git-receive-pack | ||
| /git-reflog | ||
| /git-relink | ||
| /git-remote | ||
| /git-remote-http | ||
| /git-remote-https | ||
| /git-remote-ftp | ||
| /git-remote-ftps | ||
| /git-remote-fd | ||
| /git-remote-ext | ||
| /git-remote-testgit | ||
| /git-repack | ||
| /git-replace | ||
| /git-repo-config | ||
| /git-request-pull | ||
| /git-rerere | ||
| /git-reset | ||
| /git-rev-list | ||
| /git-rev-parse | ||
| /git-revert | ||
| /git-rm | ||
| /git-send-email | ||
| /git-send-pack | ||
| /git-sh-i18n | ||
| /git-sh-i18n--envsubst | ||
| /git-sh-setup | ||
| /git-sh-i18n | ||
| /git-shell | ||
| /git-shortlog | ||
| /git-show | ||
| /git-show-branch | ||
| /git-show-index | ||
| /git-show-ref | ||
| /git-stage | ||
| /git-stash | ||
| /git-status | ||
| /git-stripspace | ||
| /git-submodule | ||
| /git-svn | ||
| /git-symbolic-ref | ||
| /git-tag | ||
| /git-tar-tree | ||
| /git-unpack-file | ||
| /git-unpack-objects | ||
| /git-update-index | ||
| /git-update-ref | ||
| /git-update-server-info | ||
| /git-upload-archive | ||
| /git-upload-pack | ||
| /git-var | ||
| /git-verify-pack | ||
| /git-verify-tag | ||
| /git-web--browse | ||
| /git-whatchanged | ||
| /git-write-tree | ||
| /git-core-*/?* | ||
| /gitk-git/gitk-wish | ||
| /gitweb/GITWEB-BUILD-OPTIONS | ||
| /gitweb/gitweb.cgi | ||
| /gitweb/static/gitweb.js | ||
| /gitweb/static/gitweb.min.* | ||
| /test-chmtime | ||
| /test-ctype | ||
| /test-date | ||
| /test-delta | ||
| /test-dump-cache-tree | ||
| /test-genrandom | ||
| /test-index-version | ||
| /test-line-buffer | ||
| /test-match-trees | ||
| /test-mktemp | ||
| /test-obj-pool | ||
| /test-parse-options | ||
| /test-path-utils | ||
| /test-run-command | ||
| /test-sha1 | ||
| /test-sigchain | ||
| /test-string-pool | ||
| /test-subprocess | ||
| /test-svn-fe | ||
| /test-treap | ||
| /common-cmds.h | ||
| *.tar.gz | ||
| *.dsc | ||
| *.deb | ||
| git-core.spec | ||
| /git.spec | ||
| *.exe | ||
| libgit.a | ||
| *.o | ||
| *.[aos] | ||
| *.py[co] | ||
| config.mak | ||
| git-blame | ||
| .depend/ | ||
| *.gcda | ||
| *.gcno | ||
| *.gcov | ||
| /coverage-untested-functions | ||
| /cover_db/ | ||
| /cover_db_html/ | ||
| *+ | ||
| /config.mak | ||
| /autom4te.cache | ||
| /config.cache | ||
| /config.log | ||
| /config.status | ||
| /config.mak.autogen | ||
| /config.mak.append | ||
| /configure | ||
| /tags | ||
| /TAGS | ||
| /cscope* | ||
| *.obj | ||
| *.lib | ||
| *.sln | ||
| *.suo | ||
| *.ncb | ||
| *.vcproj | ||
| *.user | ||
| *.idb | ||
| *.pdb | ||
| /Debug/ | ||
| /Release/ |
Oops, something went wrong.