Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'cn/fetch-prune' | Junio C Hamano | 2011-10-26 |
|\ | |||
| * | fetch: treat --tags like refs/tags/*:refs/tags/* when pruning | Carlos Martín Nieto | 2011-10-15 |
| * | fetch: honor the user-provided refspecs when pruning refs | Carlos Martín Nieto | 2011-10-15 |
| * | fetch: free all the additional refspecs | Carlos Martín Nieto | 2011-10-07 |
* | | Merge branch 'jc/match-refs-clarify' | Junio C Hamano | 2011-10-21 |
|\ \ | |||
| * | | rename "match_refs()" to "match_push_refs()" | Junio C Hamano | 2011-09-12 |
| * | | send-pack: typofix error message | Junio C Hamano | 2011-09-12 |
* | | | Merge branch 'jk/maint-pack-objects-compete-with-delete' | Junio C Hamano | 2011-10-21 |
|\ \ \ | |||
| * | | | downgrade "packfile cannot be accessed" errors to warnings | Jeff King | 2011-10-14 |
| * | | | pack-objects: protect against disappearing packs | Jeff King | 2011-10-14 |
| | |/ | |/| | |||
* | | | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-10-19 |
|\ \ \ | |||
| * | | | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 |
| |/ / | |||
* | | | Merge branch 'js/no-cherry-pick-head-after-punted' | Junio C Hamano | 2011-10-19 |
|\ \ \ | |||
| * \ \ | Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... | Junio C Hamano | 2011-10-06 |
| |\ \ \ | |||
| | * | | | cherry-pick: do not give irrelevant advice when cherry-pick punted | Jay Soffian | 2011-10-06 |
| | * | | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | Jay Soffian | 2011-10-06 |
* | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' | Junio C Hamano | 2011-10-19 |
|\ \ \ \ \ | |||
| * | | | | | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 |
* | | | | | | Merge branch 'bc/attr-ignore-case' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ | |||
| * | | | | | | attr: read core.attributesfile from git_default_core_config | Junio C Hamano | 2011-10-06 |
| * | | | | | | builtin/mv.c: plug miniscule memory leak | Brandon Casey | 2011-10-06 |
| * | | | | | | cleanup: use internal memory allocation wrapper functions everywhere | Brandon Casey | 2011-10-06 |
* | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | config: display key_delim for config --bool --get-regexp | Matthieu Moy | 2011-10-10 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'tc/fetch-leak' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | fetch: plug two leaks on error exit in store_updated_refs | Tay Ray Chuan | 2011-10-07 |
* | | | | | | | | Merge branch 'ph/push-to-delete-nothing' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooks | Pang Yan Han | 2011-09-30 |
| | |_|_|_|_|/ / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' | Junio C Hamano | 2011-10-17 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $tree | Junio C Hamano | 2011-09-30 |
| | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-15 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-15 |
* | | | | | | | | | Merge branch 'il/archive-err-signal' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Support ERR in remote archive like in fetch/push | Ilari Liusvaara | 2011-10-05 |
* | | | | | | | | | | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-04 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'rs/pending' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | commit: factor out clear_commit_marks_for_object_array | René Scharfe | 2011-10-03 |
| * | | | | | | | | | checkout: use leak_pending flag | René Scharfe | 2011-10-03 |
| * | | | | | | | | | checkout: use add_pending_{object,sha1} in orphan check | René Scharfe | 2011-10-03 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' | Junio C Hamano | 2011-10-13 |
* | | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' | Junio C Hamano | 2011-10-13 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Accept tags in HEAD or MERGE_HEAD | Nguyễn Thái Ngọc Duy | 2011-09-18 |
| * | | | | | | | | | merge: remove global variable head[] | Nguyễn Thái Ngọc Duy | 2011-09-18 |
| * | | | | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalid | Nguyễn Thái Ngọc Duy | 2011-09-18 |
| * | | | | | | | | | merge: keep stash[] a local variable | Nguyễn Thái Ngọc Duy | 2011-08-26 |
* | | | | | | | | | | Merge branch 'bw/grep-no-index-no-exclude' | Junio C Hamano | 2011-10-13 |
* | | | | | | | | | | Merge branch 'jc/parse-options-boolean' | Junio C Hamano | 2011-10-12 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | apply: use OPT_NOOP_NOARG | René Scharfe | 2011-09-28 |
| * | | | | | | | | | | revert: use OPT_NOOP_NOARG | René Scharfe | 2011-09-28 |
| | |_|/ / / / / / / | |/| | | | | | | | |