Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'nd/attr-optim' | Junio C Hamano | 2015-02-25 | 1 | -10/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | attr: avoid heavy work when we know the specified attr is not definednd/attr-optim | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -5/+28 | |
| * | | | | | | | | | | | attr: do not attempt to expand when we know it's not a macro | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -3/+7 | |
| * | | | | | | | | | | | attr.c: rename arg name attr_nr to avoid shadowing the global one | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -3/+3 | |
* | | | | | | | | | | | | Merge branch 'jn/doc-api-errors' | Junio C Hamano | 2015-02-25 | 1 | -0/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | doc: document error handling functions and conventions | Jonathan Nieder | 2014-12-04 | 1 | -0/+75 | |
* | | | | | | | | | | | | | Sync with 2.3.1 | Junio C Hamano | 2015-02-24 | 3 | -2/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Git 2.3.1v2.3.1 | Junio C Hamano | 2015-02-24 | 4 | -3/+56 | |
| * | | | | | | | | | | | | | Merge branch 'ak/add-i-empty-candidates' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-24 | 2 | -3/+149 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'jc/doc-log-rev-list-options' into maint | Junio C Hamano | 2015-02-24 | 1 | -5/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/commit-author-no-match-malformed-message' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/dumb-http-idx-fetch-fix' into maint | Junio C Hamano | 2015-02-24 | 2 | -1/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-format-doc' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/status-read-branch-name-fix' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/push-repo-option-doc' into maint | Junio C Hamano | 2015-02-24 | 1 | -16/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dk/format-patch-ignore-diff-submodule' into maint | Junio C Hamano | 2015-02-24 | 2 | -1/+73 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint | Junio C Hamano | 2015-02-24 | 1 | -10/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/blame-commit-label' into maint | Junio C Hamano | 2015-02-24 | 11 | -34/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #4) | Junio C Hamano | 2015-02-22 | 1 | -0/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/conf-var-doc' | Junio C Hamano | 2015-02-22 | 2 | -8/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | CodingGuidelines: describe naming rules for configuration variablesjc/conf-var-doc | Junio C Hamano | 2015-02-02 | 1 | -0/+23 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | config.txt: mark deprecated variables more prominently | Junio C Hamano | 2015-01-28 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | config.txt: clarify that add.ignore-errors is deprecated | Junio C Hamano | 2015-01-28 | 1 | -5/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/squelch-openssl-warnings-on-macosx' | Junio C Hamano | 2015-02-22 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIREDes/squelch-openssl-warnings-on-macosx | Kyle J. McKay | 2015-02-09 | 1 | -3/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tc/curl-vernum-output-broken-in-7.11' | Junio C Hamano | 2015-02-22 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: handle broken curl version number in version checktc/curl-vernum-output-broken-in-7.11 | Tom G. Christensen | 2015-02-03 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/prune-mtime' | Junio C Hamano | 2015-02-22 | 3 | -13/+48 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: fix iterating loose alternate objects | Jonathon Mah | 2015-02-09 | 2 | -3/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | for_each_loose_file_in_objdir: take an optional strbuf path | Jeff King | 2015-02-09 | 2 | -10/+30 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-files-ita' | Junio C Hamano | 2015-02-22 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | run_diff_files(): clarify computation of sha1 validityjc/diff-files-ita | Junio C Hamano | 2015-02-04 | 1 | -2/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/submodule-sanitize-path-upon-add' | Junio C Hamano | 2015-02-22 | 2 | -1/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: fix '/././' path normalizationps/submodule-sanitize-path-upon-add | Patrick Steinhardt | 2015-02-02 | 2 | -1/+18 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/merge-file-prefix' | Junio C Hamano | 2015-02-22 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-file: correctly open files when in a subdirab/merge-file-prefix | Aleksander Boruch-Gruszecki | 2015-02-11 | 2 | -2/+4 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/blame-commit-info-fix' | Junio C Hamano | 2015-02-22 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/blame: destroy initialized commit_info onlyes/blame-commit-info-fix | Eric Sunshine | 2015-02-10 | 1 | -3/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/check-builtins-on-windows' | Junio C Hamano | 2015-02-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | check-builtins: strip executable suffix $X when enumerating builtinsss/check-builtins-on-windows | Sebastian Schuberth | 2015-02-05 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #3) | Junio C Hamano | 2015-02-18 | 1 | -0/+31 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-cert' | Junio C Hamano | 2015-02-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transport-helper: fix typo in error message when --signed is not supported | Mike Hommey | 2015-02-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/decimal-width-for-uintmax' | Junio C Hamano | 2015-02-18 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decimal_width: avoid integer overflowjk/decimal-width-for-uintmax | Jeff King | 2015-02-05 | 2 | -5/+5 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-no-ungetc-eof' | Junio C Hamano | 2015-02-18 | 2 | -3/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config_buf_ungetc: warn when pushing back a random characterjk/config-no-ungetc-eof | Jeff King | 2015-02-05 | 1 | -2/+6 |