summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
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
2011-09-18merge: remove global variable head[]Libravatar Nguyễn Thái Ngọc Duy1-44/+53
2011-09-18merge: use return value of resolve_ref() to determine if HEAD is invalidLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-09-15Allow git merge ":/<pattern>"Libravatar Junio C Hamano1-5/+14
2011-08-28Merge branch 'jk/color-and-pager'Libravatar Junio C Hamano1-6/+0
2011-08-26merge: keep stash[] a local variableLibravatar Nguyễn Thái Ngọc Duy1-17/+16
2011-08-25Merge branch 'jc/merge-reword'Libravatar Junio C Hamano1-1/+1
2011-08-19want_color: automatically fallback to color.uiLibravatar Jeff King1-4/+0
2011-08-18diff: refactor COLOR_DIFF from a flag into an intLibravatar Jeff King1-2/+0
2011-05-31Merge branch 'jk/format-patch-am'Libravatar Junio C Hamano1-1/+2
2011-05-26clean up calling conventions for pretty.c functionsLibravatar Jeff King1-1/+2
2011-05-25merge: reword the final messageLibravatar Junio C Hamano1-1/+1
2011-05-19Merge branch 'jk/cherry-pick-root-with-resolve'Libravatar Junio C Hamano1-2/+10
2011-05-16Merge branch 'mg/merge-ff-config'Libravatar Junio C Hamano1-0/+9
2011-05-16cherry-pick: handle root commits with external strategiesLibravatar Jeff King1-2/+10
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Libravatar Junio C Hamano1-15/+26
2011-05-06merge: introduce merge.ff configuration variableLibravatar Junio C Hamano1-0/+9
2011-05-06Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configLibravatar Junio C Hamano1-15/+26
2011-05-02Merge branch 'ab/i18n-fixup'Libravatar Junio C Hamano1-8/+8
2011-04-12i18n: mark merge CHERRY_PICK_HEAD messages for translationLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-04-12i18n: mark merge "upstream" messages for translationLibravatar Ævar Arnfjörð Bjarmason1-4/+4
2011-04-12i18n: mark merge "Could not read from" message for translationLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-04-07merge: allow "-" as a short-hand for "previous branch"Libravatar Junio C Hamano1-3/+6
2011-04-01Merge branch 'jc/merge-sans-branch'Libravatar Junio C Hamano1-2/+40
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-64/+64
2011-03-25merge: merge unborn index before setting refLibravatar Jeff King1-1/+1
2011-03-24merge: merge with the default upstream branch without argumentLibravatar Junio C Hamano1-1/+38
2011-03-24merge: match the help text with the documentationLibravatar Jared Hance1-2/+3
2011-03-19Merge branch 'jk/merge-rename-ux'Libravatar Junio C Hamano1-0/+7
2011-03-09i18n: git-merge "Wonderful" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-merge "Updating %s..%s" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2011-03-09i18n: git-merge basic messagesLibravatar Ævar Arnfjörð Bjarmason1-62/+62
2011-03-09Merge branch 'js/cherry-pick-usability'Libravatar Junio C Hamano1-0/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:43:11 +0000