summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2012-04-17builtin/merge.c: remove "remoteheads" global variableLibravatar Junio C Hamano1-23/+28
2012-04-02Sync with 1.7.9.6Libravatar Junio C Hamano1-4/+1
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportLibravatar Junio C Hamano1-1/+28
2012-03-06Merge branch 'zj/diff-stat-dyncol'Libravatar Junio C Hamano1-0/+2
2012-03-01diff --stat: add config option to limit graph widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+1
2012-03-01merge --stat: use the full terminal widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+1
2012-02-27Merge branch 'tr/merge-edit-guidance' into maintLibravatar Junio C Hamano1-0/+10
2012-02-23merge: do not trust fstat(2) too much when checking interactivenessLibravatar Junio C Hamano1-1/+1
2012-02-12Merge branch 'jn/merge-no-edit-fix'Libravatar Junio C Hamano1-1/+2
2012-02-10Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Libravatar Junio C Hamano1-1/+2
2012-02-09merge: do not launch an editor on "--no-edit $tag"Libravatar Junio C Hamano1-3/+7
2012-02-05merge: do not create a signed tag merge under --ff-only optionLibravatar Junio C Hamano1-1/+2
2012-01-31Merge branch 'tr/merge-edit-guidance'Libravatar Junio C Hamano1-0/+10
2012-01-31Merge branch 'jc/pull-signed-tag'Libravatar Junio C Hamano1-4/+34
2012-01-31merge: add instructions to the commit message when editingLibravatar Thomas Rast1-0/+10
2012-01-23merge: use editor by default in interactive sessionsLibravatar Junio C Hamano1-4/+34
2012-01-06Merge branch 'jc/show-sig'Libravatar Junio C Hamano1-2/+12
2011-12-22Merge branch 'jk/maint-strbuf-missing-init'Libravatar Junio C Hamano1-1/+1
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Libravatar Junio C Hamano1-2/+4
2011-12-19Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano1-7/+5
2011-12-18Update jk/maint-strbuf-missing-init to builtin/ renameLibravatar Junio C Hamano1-0/+1292
2011-12-15Convert commit_tree() to take strbuf as messageLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2011-12-15merge: abort if fails to commitLibravatar Nguyễn Thái Ngọc Duy1-2/+4
2011-12-13Merge branch 'nd/ignore-might-be-precious'Libravatar Junio C Hamano1-4/+8
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionLibravatar Nguyễn Thái Ngọc Duy1-7/+5
2011-12-09Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano1-24/+41
2011-12-09Merge branch 'jc/pull-signed-tag'Libravatar Junio C Hamano1-45/+50
2011-12-09Merge branch 'jc/request-pull-show-head-4'Libravatar Junio C Hamano1-10/+10
2011-12-05Copy resolve_ref() return value for longer useLibravatar Nguyễn Thái Ngọc Duy1-22/+40
2011-12-05Merge branch 'nd/maint-ignore-exclude'Libravatar Junio C Hamano1-1/+1
2011-12-05Merge branch 'vr/git-merge-default-to-upstream'Libravatar Junio C Hamano1-3/+6
2011-11-28checkout,merge: disallow overwriting ignored files with --no-overwrite-ignoreLibravatar Nguyễn Thái Ngọc Duy1-4/+8
2011-11-28Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousLibravatar Junio C Hamano1-1/+1
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-11-21Show error for 'git merge' with unset merge.defaultToUpstreamLibravatar Vincent van Ravesteijn1-3/+6
2011-11-17do not let git_path clobber errno when reporting errorsLibravatar Jonathan Nieder1-20/+29
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2011-11-12commit: teach --gpg-sign optionLibravatar Junio C Hamano1-2/+14
2011-11-09merge: force edit and no-ff mode when merging a tag objectLibravatar Junio C Hamano1-0/+6
2011-11-08merge: record tag objects without peeling in MERGE_HEADLibravatar Junio C Hamano1-3/+10
2011-11-08merge: make usage of commit->util more extensibleLibravatar Junio C Hamano1-40/+23
2011-11-07fmt-merge-msg: package options into a structureLibravatar Junio C Hamano1-2/+6
2011-11-07merge: notice local merging of tags and keep it unwrappedLibravatar Junio C Hamano1-0/+5
2011-10-21Merge branch 'nd/maint-autofix-tag-in-head' into maintLibravatar Junio C Hamano1-56/+61
2011-10-19Merge branch 'js/merge-edit-option'Libravatar Junio C Hamano1-39/+70
2011-10-13Merge branch 'nd/maint-autofix-tag-in-head'Libravatar Junio C Hamano1-56/+61
2011-10-12Teach merge the '[-e|--edit]' optionLibravatar Jay Soffian1-39/+70
2011-10-07fmt-merge-msg: use branch.$name.descriptionLibravatar Junio C Hamano1-10/+10
2011-10-05Merge branch 'jc/want-commit'Libravatar Junio C Hamano1-5/+14
2011-09-18Accept tags in HEAD or MERGE_HEADLibravatar Nguyễn Thái Ngọc Duy1-5/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 00:08:32 +0000