summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/parseopt-string-list' into jk/string-list-static-initJunio C Hamano2016-06-133-10/+10
|\
| * blame,shortlog: don't make local option variables staticJeff King2016-06-132-9/+9
| * interpret-trailers: don't duplicate option stringsJeff King2016-06-131-1/+1
* | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-05-171-65/+0
|\ \
| * | submodule: stop sanitizing config optionsjk/submodule-c-credentialJeff King2016-05-061-17/+0
| * | submodule--helper: move config-sanitizing to submodule.cJeff King2016-04-281-48/+0
* | | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-174-14/+18
|\ \ \
| * | | i18n: builtin/pull.c: split strings marked for translationVasco Almeida2016-04-191-4/+4
| * | | i18n: builtin/pull.c: mark placeholders for translationVasco Almeida2016-04-191-3/+3
| * | | i18n: branch: move comment for translatorsVasco Almeida2016-04-131-2/+4
| * | | i18n: branch: unmark string for translationVasco Almeida2016-04-131-2/+2
| * | | i18n: builtin/rm.c: remove a comma ',' from stringVasco Almeida2016-04-121-1/+1
| * | | i18n: builtin/branch.c: mark option for translationVasco Almeida2016-04-081-1/+1
| * | | i18n: index-pack: use plural string instead of normal oneVasco Almeida2016-04-081-1/+3
* | | | Merge branch 'lp/typofixes'Junio C Hamano2016-05-171-1/+1
|\ \ \ \
| * | | | typofix: assorted typofixes in comments, documentation and messageslp/typofixesLi Peng2016-05-061-1/+1
| |/ / /
* | | | Merge branch 'sb/submodule-init'Junio C Hamano2016-05-171-14/+353
|\ \ \ \
| * | | | submodule init: redirect stdout to stderrStefan Beller2016-05-031-1/+2
| * | | | submodule--helper update-clone: abort gracefully on missing .gitmodulesStefan Beller2016-04-291-13/+25
| * | | | submodule init: fail gracefully with a missing .gitmodules fileStefan Beller2016-04-291-3/+7
| * | | | submodule: port init from shell to CStefan Beller2016-04-161-0/+115
| * | | | submodule: port resolve_relative_url from shell to CStefan Beller2016-04-161-1/+208
| * | | | Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-initJunio C Hamano2016-04-1455-706/+689
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-initJunio C Hamano2016-04-141-23/+18
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Junio C Hamano2016-05-131-4/+0
|\ \ \ \ \ \
| * | | | | | commit-tree: do not pay attention to commit.gpgsignjc/commit-tree-ignore-commit-gpgsignJunio C Hamano2016-05-031-4/+0
* | | | | | | Merge branch 'ew/doc-split-pack-disables-bitmap'Junio C Hamano2016-05-101-1/+8
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmapEric Wong2016-04-281-1/+8
| * | | | | | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-141-5/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-141-1/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-142-2/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-141-3/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-141-18/+32
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-141-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-141-18/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2016-05-064-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson2016-04-254-16/+16
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru'Junio C Hamano2016-05-061-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | clone: add `--shallow-submodules` flagStefan Beller2016-04-261-0/+7
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'js/name-rev-use-oldest-ref'Junio C Hamano2016-05-031-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-221-6/+13
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'st/verify-tag'Junio C Hamano2016-04-292-61/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tag -v: verify directly rather than exec-ing verify-tagSantiago Torres2016-04-221-7/+1
| * | | | | | | | | | | | | | verify-tag: move tag verification code to tag.cSantiago Torres2016-04-221-54/+1
| * | | | | | | | | | | | | | verify-tag: prepare verify_tag for libificationSantiago Torres2016-04-221-9/+17
| * | | | | | | | | | | | | | verify-tag: update variable name and typeSantiago Torres2016-04-191-5/+6
| * | | | | | | | | | | | | | builtin/verify-tag.c: ignore SIGPIPE in gpg-interfaceSantiago Torres2016-04-061-3/+0
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-291-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-rootJunio C Hamano2016-04-211-0/+6
* | | | | | | | | | | | | | | Merge branch 'js/replace-edit-use-editor-configuration'Junio C Hamano2016-04-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status