summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-08-021-19/+1
|\
| * Revert "cat-file: split --batch input lines on whitespace"Junio C Hamano2013-08-021-19/+1
* | Merge branch 'ob/typofixes'Junio C Hamano2013-08-012-2/+2
|\ \
| * | many small typofixesob/typofixesOndřej Bílka2013-07-292-2/+2
* | | Merge branch 'jc/rm-submodule-error-message'Junio C Hamano2013-08-011-21/+20
|\ \ \
| * | | builtin/rm.c: consolidate error reporting for removing submodulesjc/rm-submodule-error-messageJunio C Hamano2013-07-251-21/+20
* | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-08-011-28/+52
|\ \ \ \
| * | | | git-clean: implement partial matching for selectionJiang Xin2013-07-241-28/+52
* | | | | Merge branch 'jk/commit-how-to-abort-cherry-pick'Junio C Hamano2013-07-311-3/+22
|\ \ \ \ \
| * | | | | commit: tweak empty cherry pick advice for sequencerjk/commit-how-to-abort-cherry-pickJeff King2013-07-291-3/+22
* | | | | | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-07-241-3/+13
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | sha1_object_info_extended: make type calculation optionalJeff King2013-07-121-3/+4
| * | | | | cat-file: disable object/refname ambiguity check for batch modeJeff King2013-07-121-0/+9
* | | | | | Merge branch 'sb/misc-fixes'Junio C Hamano2013-07-241-1/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | commit: Fix a memory leak in determine_author_infoStefan Beller2013-07-151-1/+0
* | | | | | Sync with Git 1.8.3.4Junio C Hamano2013-07-221-1/+1
|\ \ \ \ \ \
| * | | | | | update URL to the marc.info mail archiveOndřej Bílka2013-07-221-1/+1
| * | | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maintJunio C Hamano2013-07-213-4/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jc/name-rev-exact-ref'Junio C Hamano2013-07-222-32/+118
|\ \ \ \ \ \ \ \
| * | | | | | | | describe: fix --contains when a tag is given as inputjc/name-rev-exact-refJunio C Hamano2013-07-182-2/+18
| * | | | | | | | name-rev: differentiate between tags and commits they point atJunio C Hamano2013-07-181-8/+16
| * | | | | | | | describe: use argv-arrayJunio C Hamano2013-07-091-15/+15
| * | | | | | | | name-rev: allow converting the exact object name at the tip of a refJunio C Hamano2013-07-091-1/+58
| * | | | | | | | name-ref: factor out name shortening logic from name_ref()Junio C Hamano2013-07-071-7/+12
* | | | | | | | | Merge branch 'es/check-mailmap'Junio C Hamano2013-07-221-0/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin: add git-check-mailmap commandEric Sunshine2013-07-131-0/+66
* | | | | | | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-07-223-41/+760
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | git-clean: add ask each interactive actionJiang Xin2013-06-261-0/+36
| * | | | | | | | | git-clean: add select by numbers interactive actionJiang Xin2013-06-261-0/+39
| * | | | | | | | | git-clean: add filter by pattern interactive actionJiang Xin2013-06-261-0/+68
| * | | | | | | | | git-clean: use a git-add-interactive compatible UIJiang Xin2013-06-261-29/+427
| * | | | | | | | | git-clean: add colors to interactive git-cleanJiang Xin2013-06-261-1/+72
| * | | | | | | | | git-clean: show items of del_list in columnsJiang Xin2013-06-261-9/+40
| * | | | | | | | | git-clean: add support for -i/--interactiveJiang Xin2013-06-261-5/+52
| * | | | | | | | | git-clean: refactor git-clean into two phasesJiang Xin2013-06-261-19/+45
| * | | | | | | | | write_name{_quoted_relative,}(): remove redundant parametersJiang Xin2013-06-261-9/+8
| * | | | | | | | | quote_path_relative(): remove redundant parameterJiang Xin2013-06-263-13/+12
| * | | | | | | | | quote.c: substitute path_relative with relative_pathJiang Xin2013-06-261-2/+7
* | | | | | | | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-07-221-4/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | teach config --blob option to parse config from databaseHeiko Voigt2013-07-121-4/+27
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-2210-32/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-0910-32/+33
* | | | | | | | | | | Merge branch 'jk/gcc-function-attributes'Junio C Hamano2013-07-221-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add the LAST_ARG_MUST_BE_NULL macrojk/gcc-function-attributesRamsay Jones2013-07-191-2/+2
| * | | | | | | | | | | use "sentinel" function attribute for variadic listsJeff King2013-07-091-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'db/show-ref-head'Junio C Hamano2013-07-221-2/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | show-ref: make --head always show the HEAD refdb/show-ref-headDoug Bell2013-07-171-2/+6
* | | | | | | | | | | | Merge branch 'tr/do-not-call-submodules-subprojects'Junio C Hamano2013-07-222-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | show-branch: fix description of --date-ordertr/do-not-call-submodules-subprojectsThomas Rast2013-07-181-3/+3
| * | | | | | | | | | | | apply, entry: speak of submodules instead of subprojectsThomas Rast2013-07-181-1/+1