summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'nd/attr-optim'Junio C Hamano2015-02-251-10/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | attr: avoid heavy work when we know the specified attr is not definednd/attr-optimNguyễn Thái Ngọc Duy2014-12-291-5/+28
| * | | | | | | | | | | attr: do not attempt to expand when we know it's not a macroNguyễn Thái Ngọc Duy2014-12-291-3/+7
| * | | | | | | | | | | attr.c: rename arg name attr_nr to avoid shadowing the global oneNguyễn Thái Ngọc Duy2014-12-291-3/+3
* | | | | | | | | | | | Merge branch 'jn/doc-api-errors'Junio C Hamano2015-02-251-0/+75
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: document error handling functions and conventionsJonathan Nieder2014-12-041-0/+75
* | | | | | | | | | | | | Sync with 2.3.1Junio C Hamano2015-02-243-2/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Git 2.3.1v2.3.1Junio C Hamano2015-02-244-3/+56
| * | | | | | | | | | | | | Merge branch 'ak/add-i-empty-candidates' into maintJunio C Hamano2015-02-241-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-242-3/+149
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'jc/doc-log-rev-list-options' into maintJunio C Hamano2015-02-241-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/dumb-http-idx-fetch-fix' into maintJunio C Hamano2015-02-242-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-format-doc' into maintJunio C Hamano2015-02-241-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maintJunio C Hamano2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/status-read-branch-name-fix' into maintJunio C Hamano2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/push-repo-option-doc' into maintJunio C Hamano2015-02-241-16/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maintJunio C Hamano2015-02-241-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2015-02-242-1/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano2015-02-241-10/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-2411-34/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #4)Junio C Hamano2015-02-221-0/+28
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/conf-var-doc'Junio C Hamano2015-02-222-8/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | CodingGuidelines: describe naming rules for configuration variablesjc/conf-var-docJunio C Hamano2015-02-021-0/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | config.txt: mark deprecated variables more prominentlyJunio C Hamano2015-01-281-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | config.txt: clarify that add.ignore-errors is deprecatedJunio C Hamano2015-01-281-5/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/squelch-openssl-warnings-on-macosx'Junio C Hamano2015-02-221-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIREDes/squelch-openssl-warnings-on-macosxKyle J. McKay2015-02-091-3/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tc/curl-vernum-output-broken-in-7.11'Junio C Hamano2015-02-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: handle broken curl version number in version checktc/curl-vernum-output-broken-in-7.11Tom G. Christensen2015-02-031-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2015-02-223-13/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: fix iterating loose alternate objectsJonathon Mah2015-02-092-3/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | for_each_loose_file_in_objdir: take an optional strbuf pathJeff King2015-02-092-10/+30
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-files-ita'Junio C Hamano2015-02-221-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | run_diff_files(): clarify computation of sha1 validityjc/diff-files-itaJunio C Hamano2015-02-041-2/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/submodule-sanitize-path-upon-add'Junio C Hamano2015-02-222-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: fix '/././' path normalizationps/submodule-sanitize-path-upon-addPatrick Steinhardt2015-02-022-1/+18
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/merge-file-prefix'Junio C Hamano2015-02-222-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-file: correctly open files when in a subdirab/merge-file-prefixAleksander Boruch-Gruszecki2015-02-112-2/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/blame-commit-info-fix'Junio C Hamano2015-02-221-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/blame: destroy initialized commit_info onlyes/blame-commit-info-fixEric Sunshine2015-02-101-3/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/check-builtins-on-windows'Junio C Hamano2015-02-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | check-builtins: strip executable suffix $X when enumerating builtinsss/check-builtins-on-windowsSebastian Schuberth2015-02-051-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #3)Junio C Hamano2015-02-181-0/+31
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2015-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | transport-helper: fix typo in error message when --signed is not supportedMike Hommey2015-02-121-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/decimal-width-for-uintmax'Junio C Hamano2015-02-182-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decimal_width: avoid integer overflowjk/decimal-width-for-uintmaxJeff King2015-02-052-5/+5
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-no-ungetc-eof'Junio C Hamano2015-02-182-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config_buf_ungetc: warn when pushing back a random characterjk/config-no-ungetc-eofJeff King2015-02-051-2/+6