summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano2011-10-211-0/+4
|\
| * downgrade "packfile cannot be accessed" errors to warningsjk/maint-pack-objects-compete-with-deleteJeff King2011-10-141-1/+1
| * pack-objects: protect against disappearing packsJeff King2011-10-141-0/+4
* | Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-191-39/+70
|\ \
| * | Teach merge the '[-e|--edit]' optionJay Soffian2011-10-121-39/+70
| |/
* | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-191-7/+16
|\ \
| * \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-061-7/+16
| |\ \
| | * | cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-puntedJay Soffian2011-10-061-5/+7
| | * | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-061-2/+9
* | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-191-0/+3
|\ \ \ \
| * | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-121-0/+3
* | | | | Merge branch 'bc/attr-ignore-case'Junio C Hamano2011-10-172-1/+7
|\ \ \ \ \
| * | | | | attr: read core.attributesfile from git_default_core_configJunio C Hamano2011-10-061-0/+2
| * | | | | builtin/mv.c: plug miniscule memory leakBrandon Casey2011-10-061-1/+5
| * | | | | cleanup: use internal memory allocation wrapper functions everywhereBrandon Casey2011-10-061-1/+1
* | | | | | Merge branch 'mm/maint-config-explicit-bool-display'Junio C Hamano2011-10-171-7/+13
|\ \ \ \ \ \
| * | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-101-7/+13
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tc/fetch-leak'Junio C Hamano2011-10-171-4/+9
|\ \ \ \ \ \
| * | | | | | fetch: plug two leaks on error exit in store_updated_refsTay Ray Chuan2011-10-071-4/+9
* | | | | | | Merge branch 'ph/push-to-delete-nothing'Junio C Hamano2011-10-171-8/+18
|\ \ \ \ \ \ \
| * | | | | | | 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 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2011-10-171-1/+5
|\ \ \ \ \ \ \
| * | | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-301-1/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-151-1/+1
* | | | | | | | Merge branch 'il/archive-err-signal'Junio C Hamano2011-10-131-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Support ERR in remote archive like in fetch/pushIlari Liusvaara2011-10-051-0/+2
* | | | | | | | | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-131-7/+17
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-041-10/+20
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rs/pending'Junio C Hamano2011-10-131-28/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: factor out clear_commit_marks_for_object_arrayrs/pendingRené Scharfe2011-10-031-7/+1
| * | | | | | | | checkout: use leak_pending flagRené Scharfe2011-10-031-13/+12
| * | | | | | | | checkout: use add_pending_{object,sha1} in orphan checkRené Scharfe2011-10-031-27/+12
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix'Junio C Hamano2011-10-131-2/+9
* | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head'Junio C Hamano2011-10-133-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 'bw/grep-no-index-no-exclude'Junio C Hamano2011-10-131-3/+3
* | | | | | | | | Merge branch 'jc/parse-options-boolean'Junio C Hamano2011-10-122-10/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply: use OPT_NOOP_NOARGjc/parse-options-booleanRené Scharfe2011-09-281-7/+2
| * | | | | | | | | revert: use OPT_NOOP_NOARGRené Scharfe2011-09-281-3/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/name-rev-usage'Junio C Hamano2011-10-121-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | name-rev: split usage stringrs/name-rev-usageRené Scharfe2011-10-031-1/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/check-ref-format-3'Junio C Hamano2011-10-107-29/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change check_refname_format() to reject unnormalized refnamesMichael Haggerty2011-10-051-8/+7
| * | | | | | | | | Inline function refname_format_print()Michael Haggerty2011-10-051-9/+7
| * | | | | | | | | Make collapse_slashes() allocate memory for its resultMichael Haggerty2011-10-051-9/+10
| * | | | | | | | | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-057-27/+8
View Lorry Controller Status