summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2014-04-171-5/+3
* Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-081-1/+12
|\
| * pack-objects: do not reuse packfiles without --delta-base-offsetJeff King2014-04-041-1/+12
* | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-086-8/+8
|\ \
| * | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-312-4/+4
| * | comments: fix misuses of "nor"Justin Lebar2014-03-314-4/+4
| * | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-11/+9
| |\ \
| * \ \ Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-181-3/+4
| |\ \ \
| * \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-181-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'ds/rev-parse-required-args' into maintJunio C Hamano2014-03-181-6/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-189-36/+18
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix'Junio C Hamano2014-04-081-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-021-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-087-9/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path"Junio C Hamano2014-03-241-3/+31
| * | | | | | | | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-246-6/+6
* | | | | | | | | Merge branch 'nd/gc-aggressive'Junio C Hamano2014-04-031-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc --aggressive: make --depth configurableNguyễn Thái Ngọc Duy2014-03-311-1/+7
* | | | | | | | | | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | object.h: centralize object flag allocationNguyễn Thái Ngọc Duy2014-03-251-1/+1
* | | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh'Junio C Hamano2014-03-311-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | rev-parse --parseopt: option argument name hintsIlya Bobyr2014-03-231-1/+12
* | | | | | | | | | | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-285-17/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-181-1/+1
| * | | | | | | | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-185-17/+38
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fr/add-interactive-argv-array'Junio C Hamano2014-03-281-11/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add: use struct argv_array in run_add_interactive()fr/add-interactive-argv-arrayFabian Ruch2014-03-181-11/+10
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/pack-bitmap-progress'Junio C Hamano2014-03-281-11/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-objects: show reused packfile objects in "Counting objects"jk/pack-bitmap-progressJeff King2014-03-171-8/+3
| * | | | | | | | | | | pack-objects: show progress for reused packfilesJeff King2014-03-171-3/+16
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-03-281-1/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | pack-objects: turn off bitmaps when skipping objectsJeff King2014-03-171-1/+11
* | | | | | | | | | | Merge branch 'nd/index-pack-error-message'Junio C Hamano2014-03-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
* | | | | | | | | | | | Merge branch 'nd/commit-editor-cleanup'Junio C Hamano2014-03-251-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit: add --cleanup=scissorsnd/commit-editor-cleanupNguyễn Thái Ngọc Duy2014-02-251-3/+11
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/warn-on-object-refname-ambiguity'Junio C Hamano2014-03-251-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cat-file: restore warn_on_object_refname_ambiguity flagJeff King2014-03-131-0/+3
| * | | | | | | | | | | | cat-file: fix a minor memory leak in batch_objectsJeff King2014-01-071-0/+1
| * | | | | | | | | | | | cat-file: refactor error handling of batch_objectsJeff King2014-01-071-6/+5
* | | | | | | | | | | | | Merge branch 'jk/mv-submodules-fix'Junio C Hamano2014-03-251-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fixbrian m. carlson2014-03-171-0/+5
| * | | | | | | | | | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-111-0/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/upload-pack-shallow'Junio C Hamano2014-03-211-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | upload-pack: send shallow info over stdin to pack-objectsnd/upload-pack-shallowNguyễn Thái Ngọc Duy2014-03-111-0/+10
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/tag-version-sort'Junio C Hamano2014-03-211-5/+66
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tag: support --sort=<spec>nd/tag-version-sortNguyễn Thái Ngọc Duy2014-02-271-5/+66
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/shallow-update-fix'Junio C Hamano2014-03-211-12/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | shallow: automatically clean up shallow tempfilesJeff King2014-02-271-12/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jc/tag-contains-with'Junio C Hamano2014-03-181-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status