aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* 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
|\ \ \ \ \ \ \
| * | | | | | | fetch: plug two leaks on error exit in store_updated_refsTay Ray Chuan2011-10-07
* | | | | | | | Merge branch 'ph/push-to-delete-nothing'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \
| * | | | | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooksPang Yan Han2011-09-30
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-30
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-15
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-15
* | | | | | | | | Merge branch 'il/archive-err-signal'Junio C Hamano2011-10-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support ERR in remote archive like in fetch/pushIlari Liusvaara2011-10-05
* | | | | | | | | | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-13
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-04
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/pending'Junio C Hamano2011-10-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: factor out clear_commit_marks_for_object_arrayRené Scharfe2011-10-03
| * | | | | | | | | checkout: use leak_pending flagRené Scharfe2011-10-03
| * | | | | | | | | checkout: use add_pending_{object,sha1} in orphan checkRené Scharfe2011-10-03
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix'Junio C Hamano2011-10-13
* | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head'Junio C Hamano2011-10-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-18
| * | | | | | | | | merge: remove global variable head[]Nguyễn Thái Ngọc Duy2011-09-18
| * | | | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy2011-09-18
| * | | | | | | | | merge: keep stash[] a local variableNguyễn Thái Ngọc Duy2011-08-26
* | | | | | | | | | Merge branch 'bw/grep-no-index-no-exclude'Junio C Hamano2011-10-13
* | | | | | | | | | Merge branch 'jc/parse-options-boolean'Junio C Hamano2011-10-12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: use OPT_NOOP_NOARGRené Scharfe2011-09-28
| * | | | | | | | | | revert: use OPT_NOOP_NOARGRené Scharfe2011-09-28
| | |_|/ / / / / / / | |/| | | | | | | |