summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-261-7/+21
|\
| * Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-261-7/+21
| |\
| | * remote: only update remote-tracking branch if updating refspecMartin von Zweigbergk2011-09-111-3/+7
| | * remote rename: warn when refspec was not updatedMartin von Zweigbergk2011-09-111-0/+6
| | * remote: "rename o foo" should not rename ref "origin/bar"Martin von Zweigbergk2011-09-111-1/+1
| | * remote: write correct fetch spec when renaming remote 'remote'Martin von Zweigbergk2011-09-111-4/+8
| * | Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-233-7/+11
| |\ \
| * | | describe: Refresh the index when run with --dirtyAllan Caffee2011-09-231-2/+15
| * | | Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-231-29/+90
| |\ \ \
| * \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-232-2/+19
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-231-3/+3
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano2011-10-213-59/+66
|\ \ \ \ \ \ \
| * | | | | | | Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-183-8/+7
| * | | | | | | merge: remove global variable head[]Nguyễn Thái Ngọc Duy2011-09-181-44/+53
| * | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy2011-09-181-1/+1
| * | | | | | | merge: keep stash[] a local variableNguyễn Thái Ngọc Duy2011-08-261-17/+16
* | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-211-2/+9
* | | | | | | | Merge branch 'il/archive-err-signal' into maintJunio C Hamano2011-10-211-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Support ERR in remote archive like in fetch/pushIlari Liusvaara2011-10-051-0/+2
* | | | | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-211-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-121-0/+3
* | | | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-211-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-301-1/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-211-7/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-101-7/+13
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ms/patch-id-with-overlong-line' into maintJunio C Hamano2011-10-151-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | patch-id.c: use strbuf instead of a fixed bufferMichael Schubert2011-09-221-4/+6
* | | | | | | | | | | Merge branch 'jc/maint-bundle-too-quiet' into maintJunio C Hamano2011-10-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Teach progress eye-candy to fetch_refs_from_bundle()Junio C Hamano2011-09-191-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/maint-fsck-fwrite-size-check' into maintJunio C Hamano2011-10-151-6/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fsck: do not abort upon finding an empty blobJunio C Hamano2011-09-111-6/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nm/grep-object-sha1-lock' into maintJunio C Hamano2011-10-151-0/+3
* | | | | | | | | | | 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
View Lorry Controller Status