summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-remote.txt: describe behavior without --tags and --no-tagsmg/doc-remote-tags-or-notMichael J Gruber2015-03-021-0/+3
* 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
* | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2015-01-272-929/+941
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin2015-01-271-925/+937
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | l10n: ca.po: update translationAlex Henrie2015-01-261-925/+937
| * | | | | | | | | | l10n: de.po: correct singular formMichael J Gruber2015-01-261-1/+1
| * | | | | | | | | | l10n: de.po: translate "leave behind" correctlyMichael J Gruber2015-01-261-2/+2
| * | | | | | | | | | l10n: de.po: fix typoBenedikt Heine2015-01-261-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'js/t1050'Junio C Hamano2015-01-221-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1050-large: generate large files without ddjs/t1050Johannes Sixt2015-01-141-6/+6
* | | | | | | | | | | Merge branch 'ak/cat-file-clean-up'Junio C Hamano2015-01-221-2/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cat-file: use "type" and "size" from outer scopeak/cat-file-clean-upAlexander Kuleshov2015-01-131-2/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2015-01-227-6423/+6506
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |