Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2011-12-28Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano
2011-12-18Update jk/maint-strbuf-missing-init to builtin/ renameJunio C Hamano
2011-12-14Merge branch 'maint-1.7.7' into maintJunio C Hamano
2011-12-14Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy
2011-11-18do not let git_path clobber errno when reporting errorsJonathan Nieder
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-13Teach merge the '[-e|--edit]' optionJay Soffian
2011-10-05Merge branch 'jc/want-commit'Junio C Hamano
2011-09-19Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy
2011-09-19merge: remove global variable head[]Nguyễn Thái Ngọc Duy
2011-09-19merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy
2011-09-16Allow git merge ":/<pattern>"Junio C Hamano
2011-08-29Merge branch 'jk/color-and-pager'Junio C Hamano
2011-08-27merge: keep stash[] a local variableNguyễn Thái Ngọc Duy
2011-08-26Merge branch 'jc/merge-reword'Junio C Hamano
2011-08-20want_color: automatically fallback to color.uiJeff King
2011-08-19diff: refactor COLOR_DIFF from a flag into an intJeff King
2011-05-31Merge branch 'jk/format-patch-am'Junio C Hamano
2011-05-27clean up calling conventions for pretty.c functionsJeff King
2011-05-26merge: reword the final messageJunio C Hamano
2011-05-20Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano
2011-05-17Merge branch 'mg/merge-ff-config'Junio C Hamano
2011-05-17cherry-pick: handle root commits with external strategiesJeff King
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano
2011-05-07merge: introduce merge.ff configuration variableJunio C Hamano
2011-05-07Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano
2011-05-03Merge branch 'ab/i18n-fixup'Junio C Hamano
2011-04-12i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason
2011-04-12i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason
2011-04-12i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason
2011-04-08merge: allow "-" as a short-hand for "previous branch"Junio C Hamano
2011-04-02Merge branch 'jc/merge-sans-branch'Junio C Hamano
2011-04-02Merge branch 'ab/i18n-st'Junio C Hamano
2011-03-26merge: merge unborn index before setting refJeff King
2011-03-24merge: merge with the default upstream branch without argumentJunio C Hamano
2011-03-24merge: match the help text with the documentationJared Hance
2011-03-20Merge branch 'jk/merge-rename-ux'Junio C Hamano
2011-03-10i18n: git-merge "Wonderful" messageÆvar Arnfjörð Bjarmason
2011-03-10i18n: git-merge "Updating %s..%s" messageÆvar Arnfjörð Bjarmason
2011-03-10i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason
2011-03-10Merge branch 'js/cherry-pick-usability'Junio C Hamano
2011-02-28Merge branch 'mg/placeholders-are-lowercase'Junio C Hamano
2011-02-28Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'Junio C Hamano
2011-02-22Introduce CHERRY_PICK_HEADJay Soffian
2011-02-21merge: enable progress reporting for rename detectionJeff King
2011-02-16merge: honor prepare-commit-msg hookJay Soffian
2011-02-15Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 09:23:39 +0300