forked from git-l10n/git-po
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
1,452 changed files
with
144,359 additions
and
35,448 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 |
---|---|---|
@@ -1,2 +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,179 +1,219 @@ | ||
GIT-BUILD-OPTIONS | ||
GIT-CFLAGS | ||
GIT-GUI-VARS | ||
GIT-VERSION-FILE | ||
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--tool | ||
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-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-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--interactive | ||
git-receive-pack | ||
git-reflog | ||
git-relink | ||
git-remote | ||
git-repack | ||
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-setup | ||
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-wish | ||
gitweb/gitweb.cgi | ||
test-chmtime | ||
test-ctype | ||
test-date | ||
test-delta | ||
test-dump-cache-tree | ||
test-genrandom | ||
test-match-trees | ||
test-parse-options | ||
test-path-utils | ||
test-sha1 | ||
test-sigchain | ||
common-cmds.h | ||
/GIT-BUILD-OPTIONS | ||
/GIT-CFLAGS | ||
/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--interactive | ||
/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-setup | ||
/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.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.spec | ||
/git.spec | ||
*.exe | ||
*.[aos] | ||
*.py[co] | ||
config.mak | ||
autom4te.cache | ||
config.cache | ||
config.log | ||
config.status | ||
config.mak.autogen | ||
config.mak.append | ||
configure | ||
tags | ||
TAGS | ||
cscope* | ||
.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.