summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ap/checkout-no-progress-for-non-tty'Junio C Hamano2012-05-251-2/+2
|\
| * checkout: no progress messages if !isatty(2).Avery Pennarun2012-05-241-2/+2
* | Merge branch 'rs/maint-grep-F'Junio C Hamano2012-05-251-5/+2
|\ \
| * | grep: stop leaking line strings with -fRené Scharfe2012-05-211-5/+2
* | | Sync with 1.7.10.3Junio C Hamano2012-05-251-3/+5
|\ \ \
| * | | fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds2012-05-251-3/+5
| * | | Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano2012-05-241-68/+67
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'jk/maint-reflog-walk-count-vs-time' into maintJunio C Hamano2012-05-141-0/+1
| |\ \ \
| * \ \ \ Merge branch 'ef/checkout-empty' into maintJunio C Hamano2012-05-141-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/checkout-detach-count' into maintJunio C Hamano2012-05-141-6/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ef/maint-clone-progress-fix' into maintJunio C Hamano2012-05-141-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ct/advise-push-default' into maintJunio C Hamano2012-05-111-5/+55
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano2012-05-112-49/+65
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rl/show-empty-prefix' into maintJunio C Hamano2012-05-111-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cc/fix-missing-va-end-in-revert' into maintJunio C Hamano2012-05-101-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-progress' into maintJunio C Hamano2012-05-101-0/+13
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \