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