summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* commit: simplify building parents listrs/commit-pptr-simplifyRené Scharfe2016-10-301-8/+6
* Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-064-0/+5
|\
| * diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-134-0/+5
* | Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-311-6/+13
|\ \
| * | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-221-6/+13
| |/
* | Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-261-1/+1
|\ \
| * | typofix: assorted typofixes in comments, documentation and messageslp/typofixesLi Peng2016-05-061-1/+1
* | | Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-264-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 'va/i18n-remote-comment-to-align' into maintJunio C Hamano2016-05-261-0/+2
|\ \ \
| * | | i18n: remote: add comment for translatorsva/i18n-remote-comment-to-alignVasco Almeida2016-05-091-0/+2
| |/ /
* | | Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-181-2/+3
|\ \ \
| * | | notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-011-2/+3
* | | | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-181-1/+8
|\ \ \ \
| * | | | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmapEric Wong2016-04-281-1/+8
* | | | | Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-181-9/+12
|\ \ \ \ \
| * | | | | mv: allow moving nested submodulessb/mv-submodule-fixStefan Beller2016-04-191-9/+12
* | | | | | Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-061-0/+1
|\ \ \ \ \ \
| * | | | | | replace --edit: respect core.editorjs/replace-edit-use-editor-configurationJohannes Schindelin2016-04-201-0/+1
| |/ / / / /
| * | | | | Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2016-03-172-21/+6
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-172-21/+6
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
* | | | | | | Merge branch 'cc/apply' into maintJunio C Hamano2016-05-061-15/+15
|\ \ \ \ \ \ \
| * | | | | | | builtin/apply: free patch when parse_chunk() failscc/applyChristian Couder2016-04-011-1/+3
| * | | | | | | builtin/apply: handle parse_binary() failureChristian Couder2016-04-011-0/+7
| * | | | | | | apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-221-6/+0
| * | | | | | | builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-221-8/+5
* | | | | | | | Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-021-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not ignore an empty message given by -m ''ad/commit-have-m-optionJeff King2016-04-071-3/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-021-23/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule--helper, module_clone: catch fprintf failuresb/submodule-helper-clone-regression-fixStefan Beller2016-04-011-2/+2
| * | | | | | | | submodule--helper: do not borrow absolute_path() result for too longJunio C Hamano2016-04-011-5/+4
| * | | | | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-011-14/+14
| * | | | | | | | submodule--helper clone: create the submodule path just onceStefan Beller2016-03-311-4/+0
| * | | | | | | | submodule--helper: fix potential NULL-dereferenceStefan Beller2016-03-311-4/+4
* | | | | | | | | Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-021-7/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-7/+12
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-021-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-2/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-021-8/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-291-8/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/check-repository-format' into maintJunio C Hamano2016-05-021-21/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | init: use setup.c's repo version verificationJeff King2016-03-111-9/+12
| * | | | | | | | | wrap shared_repository global in get/set accessorsJeff King2016-03-111-12/+12
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-291-0/+1
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status