aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'js/grep-mutex'Junio C Hamano2011-10-27
|\
| * builtin/grep: simplify lock_and_read_sha1_file()Junio C Hamano2011-10-26
| * builtin/grep: make lock/unlock into static inline functionsJunio C Hamano2011-10-26
| * git grep: be careful to use mutexes only when they are initializedJohannes Schindelin2011-10-26
* | Merge branch 'maint'Junio C Hamano2011-10-27
|\ \
| * | clone: Quote user supplied path in a single quote pairRichard Hartmann2011-10-27
| * | Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-26
| |\ \
| * \ \ Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-26
| |\ \ \
| * \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-26
| |\ \ \ \
| | * \ \ \ Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-26
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-23
| | |\ \ \ \ \
| | * | | | | | describe: Refresh the index when run with --dirtyAllan Caffee2011-09-23
| | * | | | | | Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-23
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-23
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-23
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-21
| * | | | | | | | | | | Merge branch 'il/archive-err-signal' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/patch-id-with-overlong-line' into maintJunio C Hamano2011-10-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-bundle-too-quiet' into maintJunio C Hamano2011-10-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fsck-fwrite-size-check' into maintJunio C Hamano2011-10-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Merge branch 'nm/grep-object-sha1-lock' into maintJunio C Hamano2011-10-15
* | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune'Junio C Hamano2011-10-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruningCarlos Martín Nieto2011-10-15
| * | | | | | | | | | | | | | | | | | fetch: honor the user-provided refspecs when pruning refsCarlos Martín Nieto2011-10-15
| * | | | | | | | | | | | | | | | | | fetch: free all the additional refspecsCarlos Martín Nieto2011-10-07
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jc/match-refs-clarify'Junio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rename "match_refs()" to "match_push_refs()"Junio C Hamano2011-09-12
| * | | | | | | | | | | | | | | | | | send-pack: typofix error messageJunio C Hamano2011-09-12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano2011-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | downgrade "packfile cannot be accessed" errors to warningsJeff King2011-10-14
| * | | | | | | | | | | | | | | | | | pack-objects: protect against disappearing packsJeff King2011-10-14
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' optionJay Soffian2011-10-12
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | cherry-pick: do not give irrelevant advice when cherry-pick puntedJay Soffian2011-10-06
| | * | | | | | | | | | | | | | | | | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-06
* | | | | | | | | | | | | | | | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-12
* | | | | | | | | | | | | | | | | | | | Merge branch 'bc/attr-ignore-case'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | attr: read core.attributesfile from git_default_core_configJunio C Hamano2011-10-06
| * | | | | | | | | | | | | | | | | | | | builtin/mv.c: plug miniscule memory leakBrandon Casey2011-10-06
| * | | | | | | | | | | | | | | | | | | | cleanup: use internal memory allocation wrapper functions everywhereBrandon Casey2011-10-06
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-10
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'tc/fetch-leak'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \