summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* remote: fix typoRalf Thielow2012-05-201-1/+1
* Merge branch 'nd/i18n-parseopt'Junio C Hamano2012-05-171-31/+31
|\
| * i18n: apply: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-05-081-31/+31
* | Merge branch 'rs/xdiff-lose-emit-func'Junio C Hamano2012-05-171-22/+31
|\ \
| * | builtin/blame.c: Fix a "Using plain integer as NULL pointer" warningRamsay Jones2012-05-141-1/+1
| * | blame: factor out helper for calling xdi_diff()René Scharfe2012-05-091-22/+16
| * | blame: use hunk_func(), part 2René Scharfe2012-05-091-5/+13
| * | blame: use hunk_func(), part 1René Scharfe2012-05-091-5/+12
| |/
* | Merge branch 'nd/threaded-index-pack'Junio C Hamano2012-05-141-66/+275
|\ \
| * | index-pack: disable threading if NO_PREAD is definedNguyễn Thái Ngọc Duy2012-05-071-0/+5
| * | index-pack: support multithreaded delta resolvingNguyễn Thái Ngọc Duy2012-05-071-11/+193
| * | index-pack: restructure pack processing into three main functionsNguyễn Thái Ngọc Duy2012-05-071-53/+75
* | | Merge branch 'ef/checkout-empty'Junio C Hamano2012-05-111-1/+1
|\ \ \
| * | | checkout: do not corrupt HEAD on empty repoErik Faye-Lund2012-05-081-1/+1
* | | | Merge branch 'jk/maint-reflog-walk-count-vs-time'Junio C Hamano2012-05-111-0/+1
|\ \ \ \
| * | | | log: respect date_mode_explicit with --format:%gdJeff King2012-05-041-0/+1
* | | | | Merge branch 'nd/i18n-branch-lego'Junio C Hamano2012-05-111-9/+23
|\ \ \ \ \
| * | | | | branch: remove lego in i18n tracking info stringsNguyễn Thái Ngọc Duy2012-05-041-9/+23
| | |_|_|/ | |/| | |
* | | | | Merge branch 'nd/i18n-apply-lego'Junio C Hamano2012-05-101-4/+11
|\ \ \ \ \
| * | | | | apply: remove lego in i18n string in gitdiff_verify_nameNguyễn Thái Ngọc Duy2012-05-081-4/+11
| |/ / / /
* | | | | Merge branch 'jk/status-porcelain-z-b'Junio C Hamano2012-05-101-73/+71
|\ \ \ \ \
| * | | | | status: refactor colopts handlingJeff King2012-05-081-5/+4
| * | | | | Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King2012-05-081-68/+67
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | status: respect "-b" for porcelain formatJeff King2012-05-081-5/+4
| | * | | | status: refactor null_termination optionJeff King2012-05-081-9/+8
| | * | | | commit: refactor option parsingJeff King2012-05-081-58/+59
| | * | | | Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-032-63/+207
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-031-1/+4
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-031-4/+13
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'ef/maint-clone-progress-fix'Junio C Hamano2012-05-101-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ef/maint-1.7.6-clone-progress-fix' into ef/maint-clone-progress...Junio C Hamano2012-05-071-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | clone: fix progress-regressionErik Faye-Lund2012-05-071-1/+1
| * | | | | | | | | Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-011-1/+41
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano2012-05-011-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-261-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-261-19/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-261-3/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/checkout-detach-count'Junio C Hamano2012-05-101-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | checkout (detached): truncate list of orphaned commits at the new HEADJohannes Sixt2012-05-041-6/+7
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jk/maint-push-progress'Junio C Hamano2012-05-031-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | teach send-pack about --[no-]progressJeff King2012-05-011-2/+12
| * | | | | | | | | | | | | | | | send-pack: show progress when isatty(2)Jeff King2012-05-011-0/+3
* | | | | | | | | | | | | | | | | Merge branch 'nd/columns'Junio C Hamano2012-05-035-8/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | tag: add --columnNguyễn Thái Ngọc Duy2012-04-271-3/+24
| * | | | | | | | | | | | | | | | | status: add --columnNguyễn Thái Ngọc Duy2012-04-271-0/+7
| * | | | | | | | | | | | | | | | | branch: add --columnNguyễn Thái Ngọc Duy2012-04-271-4/+28
| * | | | | | | | | | | | | | | | | help: reuse print_columns() for help -aNguyễn Thái Ngọc Duy2012-04-271-1/+6
| * | | | | | | | | | | | | | | | | Add column layout skeleton and git-columnNguyễn Thái Ngọc Duy2012-04-271-0/+59
View Lorry Controller Status