summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano
2012-04-18builtin/merge.c: reduce parents earlyJunio C Hamano
2012-04-18builtin/merge.c: collect other parents earlyJunio C Hamano
2012-04-18builtin/merge.c: remove "remoteheads" global variableJunio C Hamano
2012-04-02Sync with 1.7.9.6Junio C Hamano
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportJunio C Hamano
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek
2012-03-01merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek
2012-02-27Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano
2012-02-23merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano
2012-02-13Merge branch 'jn/merge-no-edit-fix'Junio C Hamano
2012-02-10Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano
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-02-01Merge branch 'tr/merge-edit-guidance'Junio C Hamano
2012-02-01Merge branch 'jc/pull-signed-tag'Junio C Hamano
2012-01-31merge: add instructions to the commit message when editingThomas Rast
2012-01-23merge: use editor by default in interactive sessionsJunio 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
generated by cgit v0.10.2-6-g49f6 at 2024-04-24 01:21:29 (GMT)