summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2012-02-09merge: do not launch an editor on "--no-edit $tag"Junio C Hamano
2012-02-06merge: do not create a signed tag merge under --ff-only optionJunio C Hamano
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano
2011-12-22Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano
2011-12-20Merge branch 'nd/resolve-ref'Junio C Hamano
2011-12-18Update jk/maint-strbuf-missing-init to builtin/ renameJunio C Hamano
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy
2011-12-15merge: abort if fails to commitNguyễn Thái Ngọc Duy
2011-12-14Merge branch 'nd/ignore-might-be-precious'Junio C Hamano
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano
2011-12-09Merge branch 'jc/pull-signed-tag'Junio C Hamano
2011-12-09Merge branch 'jc/request-pull-show-head-4'Junio C Hamano
2011-12-06Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy
2011-12-05Merge branch 'nd/maint-ignore-exclude'Junio C Hamano
2011-12-05Merge branch 'vr/git-merge-default-to-upstream'Junio C Hamano
2011-11-28checkout,merge: disallow overwriting ignored files with --no-overwrite-ignoreNguyễn Thái Ngọc Duy
2011-11-28Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousJunio C Hamano
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy
2011-11-21Show error for 'git merge' with unset merge.defaultToUpstreamVincent van Ravesteijn
2011-11-17do not let git_path clobber errno when reporting errorsJonathan Nieder
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy
2011-11-13commit: teach --gpg-sign optionJunio C Hamano
2011-11-09merge: force edit and no-ff mode when merging a tag objectJunio C Hamano
2011-11-08merge: record tag objects without peeling in MERGE_HEADJunio C Hamano
2011-11-08merge: make usage of commit->util more extensibleJunio C Hamano
2011-11-07fmt-merge-msg: package options into a structureJunio C Hamano
2011-11-07merge: notice local merging of tags and keep it unwrappedJunio C Hamano
2011-10-21Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano
2011-10-19Merge branch 'js/merge-edit-option'Junio C Hamano
2011-10-14Merge branch 'nd/maint-autofix-tag-in-head'Junio C Hamano
2011-10-12Teach merge the '[-e|--edit]' optionJay Soffian
2011-10-07fmt-merge-msg: use branch.$name.descriptionJunio C Hamano
2011-10-05Merge branch 'jc/want-commit'Junio C Hamano
2011-09-18Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy
2011-09-18merge: remove global variable head[]Nguyễn Thái Ngọc Duy
2011-09-18merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy
2011-09-15Allow git merge ":/<pattern>"Junio C Hamano
2011-08-29Merge branch 'jk/color-and-pager'Junio C Hamano
2011-08-26merge: keep stash[] a local variableNguyễn Thái Ngọc Duy
2011-08-25Merge branch 'jc/merge-reword'Junio C Hamano
2011-08-19want_color: automatically fallback to color.uiJeff King
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King
2011-05-31Merge branch 'jk/format-patch-am'Junio C Hamano
2011-05-26clean up calling conventions for pretty.c functionsJeff King
2011-05-25merge: reword the final messageJunio C Hamano
2011-05-20Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano
2011-05-16Merge branch 'mg/merge-ff-config'Junio C Hamano
2011-05-16cherry-pick: handle root commits with external strategiesJeff King
generated by cgit v0.10.2-6-g49f6 at 2024-04-19 21:26:37 (GMT)