summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/checkout-auto-track-fix' into maintJunio C Hamano2013-11-071-28/+71
|\
| * checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fixMatthieu Moy2013-10-181-5/+16
| * checkout: allow dwim for branch creation for "git checkout $branch --"Matthieu Moy2013-10-181-23/+55
* | Merge branch 'jk/clone-progress-to-stderr' into maintJunio C Hamano2013-10-281-23/+21
|\ \
| * | clone: always set transport optionsjk/clone-progress-to-stderrJeff King2013-09-181-16/+14
| * | clone: treat "checking connectivity" like other progressJeff King2013-09-181-2/+2
| * | clone: send diagnostic messages to stderrJeff King2013-09-181-5/+5
* | | Merge branch 'jk/shortlog-tolerate-broken-commit' into maintJunio C Hamano2013-10-281-2/+4
|\ \ \
| * | | shortlog: ignore commits with missing authorsjk/shortlog-tolerate-broken-commitJeff King2013-09-181-2/+4
* | | | Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano2013-10-231-0/+2
|\ \ \ \
| * | | | ls-files -k: a directory only can be killed if the index has a non-directoryJunio C Hamano2013-08-151-0/+2
| |/ / /
* | | | Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano2013-10-232-2/+2
|\ \ \ \
| * | | | list-objects: reduce one argument in mark_edges_uninterestingNguyễn Thái Ngọc Duy2013-08-282-2/+2
| | |/ / | |/| |
* | | | Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-171-1/+7
|\ \ \ \
| * | | | commit: search author pattern against mailmapap/commit-author-mailmapAntoine Pelisse2013-08-241-1/+7
| |/ / /
* | | | clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2013-10-141-0/+4
* | | | builtin/fetch.c: Fix a sparse warningjc/transport-do-not-use-connect-twice-in-fetchRamsay Jones2013-08-281-1/+1
* | | | fetch: work around "transport-take-over" hackJunio C Hamano2013-08-071-0/+13
* | | | fetch: refactor code that fetches leftover tagsJunio C Hamano2013-08-071-5/+9
* | | | fetch: refactor code that prepares a transportJunio C Hamano2013-08-071-20/+26
* | | | fetch: rename file-scope global "transport" to "gtransport"Junio C Hamano2013-08-071-11/+11
|/ / /
* | | 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