Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge: record tag objects without peeling in MERGE_HEAD | Junio C Hamano | 2011-11-08 | 1 | -3/+10 |
* | merge: make usage of commit->util more extensible | Junio C Hamano | 2011-11-08 | 1 | -40/+23 |
* | fmt-merge-msg: Add contents of merged tag in the merge message | Junio C Hamano | 2011-11-08 | 1 | -2/+70 |
* | fmt-merge-msg: package options into a structure | Junio C Hamano | 2011-11-08 | 2 | -17/+20 |
* | fmt-merge-msg: avoid early returns | Junio C Hamano | 2011-11-08 | 1 | -10/+10 |
* | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 2011-11-07 | 1 | -0/+5 |
* | fetch: do not store peeled tag object names in FETCH_HEAD | Linus Torvalds | 2011-11-05 | 1 | -2/+1 |
* | Split GPG interface into its own helper library | Junio C Hamano | 2011-11-05 | 2 | -100/+11 |
* | 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-07 | 1 | -7/+16 |
| |\ \ | |||||
| | * | | cherry-pick: do not give irrelevant advice when cherry-pick punted | Jay Soffian | 2011-10-07 | 1 | -5/+7 |
| | * | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | Jay Soffian | 2011-10-07 | 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-18 | 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-18 | 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-18 | 1 | -4/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch: plug two leaks on error exit in store_updated_refs | Tay Ray Chuan | 2011-10-08 | 1 | -4/+9 |
* | | | | | | | Merge branch 'ph/push-to-delete-nothing' | Junio C Hamano | 2011-10-18 | 1 | -8/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooks | Pang Yan Han | 2011-09-30 | 1 | -6/+12 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' | Junio C Hamano | 2011-10-18 | 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-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-16 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'il/archive-err-signal' | Junio C Hamano | 2011-10-14 | 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-14 | 1 | -7/+17 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-05 | 1 | -10/+20 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rs/pending' | Junio C Hamano | 2011-10-14 | 1 | -28/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: factor out clear_commit_marks_for_object_array | 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-14 | 1 | -2/+9 |
* | | | | | | | | Merge branch 'nd/maint-autofix-tag-in-head' | Junio C Hamano | 2011-10-14 | 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 |
* | | | | | | | | | Merge branch 'bw/grep-no-index-no-exclude' | Junio C Hamano | 2011-10-14 | 1 | -3/+3 |
* | | | | | | | | | Merge branch 'jc/parse-options-boolean' | Junio C Hamano | 2011-10-12 | 2 | -10/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | apply: use OPT_NOOP_NOARG | René Scharfe | 2011-09-28 | 1 | -7/+2 |
| * | | | | | | | | | revert: use OPT_NOOP_NOARG | René Scharfe | 2011-09-28 | 1 | -3/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs/name-rev-usage' | Junio C Hamano | 2011-10-12 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | name-rev: split usage string | René Scharfe | 2011-10-03 | 1 | -1/+3 |
| | |_|_|_|/ / / / | |/| | | | | | | |