summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
* | | | | | | | | | | | | Merge branch 'mm/color-auto-default'Junio C Hamano2013-07-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git add -e: Explicitly specify that patch should have no colormm/color-auto-defaultAndrew Wong2013-07-191-0/+1
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2013-07-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
| * | | | | | | | | | | | | Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano2013-07-193-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vv/help-unknown-ref' into maintJunio C Hamano2013-07-031-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/in-pack-size-measurement'Junio C Hamano2013-07-181-37/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | cat-file: split --batch input lines on whitespaceJeff King2013-07-121-1/+19
| * | | | | | | | | | | | | | | cat-file: add %(objectsize:disk) format atomJeff King2013-07-121-0/+6
| * | | | | | | | | | | | | | | cat-file: add --batch-check=<format>Jeff King2013-07-121-15/+92
| * | | | | | | | | | | | | | | cat-file: refactor --batch option parsingJeff King2013-07-111-18/+38
| * | | | | | | | | | | | | | | cat-file: teach --batch to stream blob objectsJeff King2013-07-111-13/+28
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/maint-clone-shared-no-connectivity-validation'Junio C Hamano2013-07-181-9/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | clone: drop connectivity check for local clonesjk/maint-clone-shared-no-connectivity-validationJeff King2013-07-081-4/+7
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/format-patch-from'Junio C Hamano2013-07-151-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | teach format-patch to place other authors into in-body "From"Jeff King2013-07-031-0/+24
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-151-22/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-021-22/+33
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-122-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-032-3/+3
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-281-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/push-head' into maintJunio C Hamano2013-06-271-7/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-271-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-271-20/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pull-to-integrate'Junio C Hamano2013-07-121-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | push: avoid suggesting "merging" remote changesJohn Keeping2013-07-071-6/+6
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-123-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-263-1/+6
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |