summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* receive-pack: don't pass non-existent refs to post-{receive,update} hooksph/push-to-delete-nothingPang Yan Han2011-09-301-6/+12
* Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-162-2/+3
|\
| * branch --set-upstream: regression fixJunio C Hamano2011-09-162-2/+3
* | Merge branch 'ph/format-patch-no-color'Junio C Hamano2011-09-141-1/+2
|\ \
| * | format-patch: ignore ui.colorPang Yan Han2011-09-121-1/+2
* | | Sync with 1.7.6.3Junio C Hamano2011-09-121-6/+9
|\ \ \
| * \ \ Merge branch 'jl/maint-fetch-submodule-check-fix' into maintJunio C Hamano2011-09-121-6/+9
| |\ \ \
| | * | | fetch: skip on-demand checking when no submodules are configuredJens Lehmann2011-09-091-6/+9
| * | | | Merge branch 'ms/reflog-show-is-default' into maintJunio C Hamano2011-09-111-2/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/reset-reflog-message-fix' into maintJunio C Hamano2011-09-111-33/+16
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/tag-contains-ab' (early part) into maintJunio C Hamano2011-09-111-1/+45
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize'Junio C Hamano2011-09-061-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | check-ref-format --print: Normalize refnames that start with slashesMichael Haggerty2011-08-251-3/+3
* | | | | | | | | Sync with 1.7.6.2Junio C Hamano2011-09-062-21/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Revert "Merge branch 'cb/maint-quiet-push' into maint"Junio C Hamano2011-09-062-21/+4
* | | | | | | | | Merge branch 'jc/clean-exclude-doc'Junio C Hamano2011-09-021-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: clarify "git clean -e <pattern>"Junio C Hamano2011-08-281-2/+3
* | | | | | | | | | Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano2011-09-021-0/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | push: Don't push a repository with unpushed submodulesFredrik Gustafsson2011-08-201-0/+19
* | | | | | | | | | | Merge branch 'nd/decorate-grafts'Junio C Hamano2011-08-281-0/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move write_shallow_commits to fetch-pack.cNguyễn Thái Ngọc Duy2011-08-181-0/+30
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/maint-clone-gitdir'Junio C Hamano2011-08-282-2/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: allow to clone from .git fileNguyễn Thái Ngọc Duy2011-08-221-1/+18
| * | | | | | | | | | | read_gitfile_gently(): rename misnamed function to read_gitfile()Junio C Hamano2011-08-221-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-08-282-14/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Prevent force-updating of the current branchConrad Irwin2011-08-222-14/+4
* | | | | | | | | | | Merge branch 'jc/maint-clone-alternates'Junio C Hamano2011-08-281-29/+90
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: clone from a repository with relative alternatesJunio C Hamano2011-08-231-23/+68
| * | | | | | | | | | | clone: allow more than one --referenceJunio C Hamano2011-08-221-8/+24
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-288-63/+19
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | want_color: automatically fallback to color.uiJeff King2011-08-197-37/+1
| * | | | | | | | | | config: refactor get_colorbool functionJeff King2011-08-191-2/+3
| * | | | | | | | | | color: delay auto-color decision until point of useJeff King2011-08-193-3/+5
| * | | | | | | | | | git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-185-20/+11
| * | | | | | | | | | diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-181-2/+0
* | | | | | | | | | | Merge branch 'nk/branch-v-abbrev'Junio C Hamano2011-08-281-1/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch -v: honor core.abbrevNamhyung Kim2011-07-011-1/+4
* | | | | | | | | | | | Merge branch 'jc/merge-reword'Junio C Hamano2011-08-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge: reword the final messageJunio C Hamano2011-05-251-1/+1
* | | | | | | | | | | | | Merge branch 'jc/maint-autofix-tag-in-head'Junio C Hamano2011-08-251-42/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit: reduce use of redundant global variablesJunio C Hamano2011-08-191-42/+45
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano2011-08-251-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | revert: plug memory leak in "cherry-pick root commit" codepathJonathan Nieder2011-08-161-6/+1
* | | | | | | | | | | | | | Merge branch 'ac/describe-dirty-refresh'Junio C Hamano2011-08-251-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | describe: Refresh the index when run with --dirtyAllan Caffee2011-08-111-2/+15
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-08-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | whitespace: have SP on both sides of an assignment "="Junio C Hamano2011-08-251-1/+1
| * | | | | | | | | | | | | | update-ref: whitespace fixPang Yan Han2011-08-251-1/+1
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'cb/maint-quiet-push' into maintJunio C Hamano2011-08-232-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-08-233-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \