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