summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-3/+2
|\
| * Allow custom "comment char"Junio C Hamano2013-01-161-3/+2
* | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano2013-01-101-0/+1
|\ \ | |/ |/|
| * merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-281-0/+1
| * Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-111-2/+1
| |\
* | \ Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Junio C Hamano2013-01-091-2/+3
|\ \ \
| * | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-031-2/+3
* | | | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-104/+2
|/ / /
* | | Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-071-24/+24
|\ \ \
| * | | i18n: merge: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-24/+24
| |/ /
* | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-2/+1
|\ \ \ | |/ / |/| / | |/
| * diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
* | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King2012-05-241-2/+2
* | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-271-54/+88
|\ \
| * | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-171-25/+40
| * | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-171-13/+27
| * | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-171-23/+28
| |/
* | Sync with 1.7.9.6Junio C Hamano2012-04-021-4/+1
|\ \ | |/
| * merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoeditJunio C Hamano2012-03-201-1/+28
| * Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-271-0/+10
| |\
* | \ Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-061-0/+2
|\ \ \
| * | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-0/+1
| * | | merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-0/+1
* | | | merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano2012-02-231-1/+1
* | | | Merge branch 'jn/merge-no-edit-fix'Junio C Hamano2012-02-121-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-3/+7
| |/ /
* | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano2012-02-101-1/+2
|\ \ \ | |/ /
| * | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-051-1/+2
* | | Merge branch 'tr/merge-edit-guidance'Junio C Hamano2012-01-311-0/+10
|\ \ \ | | |/ | |/|
| * | merge: add instructions to the commit message when editingtr/merge-edit-guidanceThomas Rast2012-01-311-0/+10
| |/
* | Merge branch 'jc/pull-signed-tag'Junio C Hamano2012-01-311-4/+34
|\ \ | |/ |/|
| * merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-4/+34
* | Merge branch 'jc/show-sig'Junio C Hamano2012-01-061-2/+12
|\ \
| * | commit: teach --gpg-sign optionJunio C Hamano2011-11-121-2/+14
| |/
* | Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano2011-12-221-1/+1
|\ \
| * | Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-initJunio C Hamano2011-12-181-1/+1
* | | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-221-2/+4
|\ \ \
| * | | Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy2011-12-151-2/+2
| * | | merge: abort if fails to commitNguyễn Thái Ngọc Duy2011-12-151-2/+4
* | | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-191-7/+5
|\ \ \ \
| * | | | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-131-7/+5
* | | | | Merge branch 'nd/ignore-might-be-precious'Junio C Hamano2011-12-131-4/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignorend/ignore-might-be-preciousNguyễn Thái Ngọc Duy2011-11-281-4/+8
| * | | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousJunio C Hamano2011-11-281-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-091-24/+41
|\ \ \ \ \
| * | | | | Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-051-22/+40
| * | | | | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-131-2/+2
* | | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-091-45/+50
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | merge: force edit and no-ff mode when merging a tag objectJunio C Hamano2011-11-091-0/+6
| * | | | | merge: record tag objects without peeling in MERGE_HEADJunio C Hamano2011-11-081-3/+10
View Lorry Controller Status