summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2015-03-052-9/+15
|\
| * rebase -i: use full object name internally throughout the scriptks/rebase-i-abbrevKirill A. Shutemov2015-01-222-9/+15
* | Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano2015-03-054-4/+0
|\ \
| * | do not include the same header twicedp/remove-duplicated-header-inclusionДилян Палаузов2015-02-134-4/+0
* | | Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maintJunio C Hamano2015-03-051-1/+1
|\ \ \
| * | | hex.c: reduce memory footprint of sha1_to_hex static bufferssb/hex-object-name-is-at-most-41-bytes-longStefan Beller2015-02-131-1/+1
* | | | Merge branch 'ak/git-pm-typofix' into maintJunio C Hamano2015-03-051-2/+2
|\ \ \ \
| * | | | Git.pm: two minor typo fixesak/git-pm-typofixAlexander Kuleshov2015-02-181-2/+2
| | |/ / | |/| |
* | | | Merge branch 'jk/sanity' into maintJunio C Hamano2015-03-054-9/+42
|\ \ \ \
| * | | | test-lib.sh: set prerequisite SANITY by testing what we really needTorsten Bögershausen2015-02-151-3/+22
| * | | | tests: correct misuses of POSIXPERMJunio C Hamano2015-01-162-5/+14
| * | | | t/lib-httpd: switch SANITY check for NOT_ROOTJeff King2015-01-162-1/+6
| | |_|/ | |/| |
* | | | 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
|\ \ \ \
| * | | | add -i: return from list_and_choose if there is no candidateak/add-i-empty-candidatesAlexander Kuleshov2015-01-221-0/+5
* | | | | Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-242-3/+149
|\ \ \ \ \
| * | | | | apply: count the size of postimage correctlyjc/apply-ws-fix-expandsJunio C Hamano2015-01-221-2/+21
| * | | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-222-0/+127
| * | | | | apply.c: typofixJunio C Hamano2015-01-221-1/+1
| |/ / / /
* | | | | Merge branch 'jc/doc-log-rev-list-options' into maintJunio C Hamano2015-02-241-5/+7
|\ \ \ \ \
| * | | | | Documentation: what does "git log --indexed-objects" even mean?jc/doc-log-rev-list-optionsJunio C Hamano2015-01-231-5/+7
* | | | | | Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano2015-02-241-1/+1
|\ \ \ \ \ \
| * | | | | | commit: reword --author error messagemg/commit-author-no-match-malformed-messageMichael J Gruber2015-01-261-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/dumb-http-idx-fetch-fix' into maintJunio C Hamano2015-02-242-1/+19
|\ \ \ \ \ \
| * | | | | | dumb-http: do not pass NULL path to parse_pack_indexjk/dumb-http-idx-fetch-fixJeff King2015-01-272-1/+19
| |/ / / / /
* | | | | | Merge branch 'jc/diff-format-doc' into maintJunio C Hamano2015-02-241-1/+2
|\ \ \ \ \ \
| * | | | | | diff-format doc: a score can follow M for rewritejc/diff-format-docJunio C Hamano2015-01-281-1/+2
* | | | | | | Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maintJunio C Hamano2015-02-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | do not check truth value of flex arraysjk/remote-curl-an-array-in-struct-cannot-be-nullJeff King2015-01-281-1/+1
* | | | | | | | Merge branch 'jk/status-read-branch-name-fix' into maintJunio C Hamano2015-02-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | read_and_strip_branch: fix typo'd address-of operatorjk/status-read-branch-name-fixJeff King2015-01-281-1/+1
* | | | | | | | | Merge branch 'mg/push-repo-option-doc' into maintJunio C Hamano2015-02-241-16/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-push.txt: document the behavior of --repomg/push-repo-option-docMichael J Gruber2015-01-281-16/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maintJunio C Hamano2015-02-241-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote-curl: fall back to Basic auth if Negotiate failsbc/http-fallback-to-password-after-krb-failsbrian m. carlson2015-01-071-0/+10
* | | | | | | | | | Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2015-02-242-1/+73
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: ignore diff.submodule settingdk/format-patch-ignore-diff-submoduleDoug Kelly2015-01-072-3/+3
| * | | | | | | | | | t4255: test am submodule with diff.submoduleDoug Kelly2015-01-071-0/+72
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano2015-02-241-10/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rerere: error out on autoupdate failurejn/rerere-fail-on-auto-update-failureJonathan Nieder2015-01-081-10/+6
* | | | | | | | | | | Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-2411-34/+29
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | blame.c: fix garbled error messagejk/blame-commit-labelLukas Fleischer2015-01-131-5/+7
| * | | | | | | | | | use xstrdup_or_null to replace ternary conditionalsJeff King2015-01-137-10/+9
| * | | | | | | | | | builtin/commit.c: use xstrdup_or_null instead of envdupJeff King2015-01-131-9/+3
| * | | | | | | | | | builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King2015-01-131-10/+5
| * | | | | | | | | | git-compat-util: add xstrdup_or_null helperJeff King2015-01-131-0/+5
* | | | | | | | | | | Git 2.3v2.3.0Junio C Hamano2015-02-053-1/+12
* | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2015-02-021-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | l10n: ca.po: Fix trailing whitespaceAlex Henrie2015-01-301-5/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Git 2.3.0-rc2v2.3.0-rc2Junio C Hamano2015-01-271-1/+1