aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2017-03-17Merge branch 'bc/object-id'Junio C Hamano1-68/+66
2017-03-14Merge branch 'jk/interpret-branch-name'Junio C Hamano1-1/+1
2017-03-02interpret_branch_name: allow callers to restrict expansionsJeff King1-1/+1
2017-02-22builtin/merge: convert to struct object_idbrian m. carlson1-68/+66
2016-12-27Merge branch 'cp/merge-continue'Junio C Hamano1-0/+25
2016-12-15merge: mark usage error strings for translationJeff King1-2/+2
2016-12-14merge: ensure '--abort' option takes no argumentsChris Packham1-0/+4
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Chris Packham1-0/+21
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano1-3/+3
2016-10-26find_unique_abbrev: use 4-buffer ringJeff King1-6/+5
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe1-1/+1
2016-08-12Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano1-34/+10
2016-08-05merge: use string_list_split() in add_strategies()René Scharfe1-34/+10
2016-07-26prepare the builtins for a libified merge_recursive()Johannes Schindelin1-0/+2
2016-07-19Merge branch 'jk/write-file'Junio C Hamano1-40/+5
2016-07-19Merge branch 'bc/cocci'Junio C Hamano1-8/+7
2016-07-08use write_file_buf where applicableJeff King1-40/+5
2016-06-28coccinelle: apply object_id Coccinelle transformationsbrian m. carlson1-7/+6
2016-06-28coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson1-1/+1
2016-06-17i18n: merge: change command option help to lowercaseVasco Almeida1-1/+1
2016-06-17i18n: merge: mark messages for translationVasco Almeida1-5/+5
2016-04-25Merge branch 'en/merge-trivial-fix'Junio C Hamano1-0/+8
2016-04-25Merge branch 'dt/pre-refs-backend'Junio C Hamano1-2/+2
2016-04-12builtin/merge.c: fix a bug with trivial mergesElijah Newren1-0/+8
2016-04-10cmd_merge(): remove unneeded flag variableMichael Haggerty1-2/+2
2016-04-08Merge branch 'jc/merge-refuse-new-root'Junio C Hamano1-3/+9
2016-04-06Merge branch 'jv/merge-nothing-into-void'Junio C Hamano1-5/+5
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano1-0/+1
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano1-3/+9
2016-03-23merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano1-5/+5
2016-02-25diff: activate diff.renames by defaultMatthieu Moy1-0/+1
2016-02-22use st_add and st_mult for allocation size computationJeff King1-1/+1
2016-01-13merge: release pack files before garbage-collectingJohannes Schindelin1-0/+1
2015-11-20Remove get_object_hash.brian m. carlson1-25/+25
2015-11-20Convert struct object to object_idbrian m. carlson1-5/+5
2015-11-20Add several uses of get_object_hash.brian m. carlson1-27/+27
2015-10-30Merge branch 'rs/pop-commit'Junio C Hamano1-7/+5
2015-10-26Merge branch 'tk/stripspace'Junio C Hamano1-1/+1
2015-10-26use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe1-7/+5
2015-10-16strbuf: make stripspace() part of strbufTobias Klauser1-1/+1
2015-10-05use sha1_to_hex_r() instead of strcpyJeff King1-10/+10
2015-08-10memoize common git-path "constant" filesJeff King1-15/+15
2015-06-05Merge branch 'jk/at-push-sha1'Junio C Hamano1-1/+1
2015-05-21remote.c: drop "remote" pointer from "struct branch"Jeff King1-1/+1
2015-05-19Merge branch 'jc/merge'Junio C Hamano1-87/+161
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano1-0/+1
2015-04-29merge: handle FETCH_HEAD internallyJunio C Hamano1-34/+72
2015-04-29merge: decide if we auto-generate the message early in collect_parents()Junio C Hamano1-7/+9
2015-04-29merge: make collect_parents() auto-generate the merge messageJunio C Hamano1-14/+22
2015-04-29merge: extract prepare_merge_message() logic outJunio C Hamano1-11/+15
2015-04-29merge: narrow scope of merge_namesJunio C Hamano1-4/+7
2015-04-29merge: split reduce_parents() out of collect_parents()Junio C Hamano1-16/+25
2015-04-29merge: clarify collect_parents() logicJunio C Hamano1-2/+11
2015-04-29merge: small leakfix and code simplificationJunio C Hamano1-2/+2
2015-04-29merge: do not check argc to determine number of remote headsJunio C Hamano1-3/+2
2015-04-29merge: clarify "pulling into void" special caseJunio C Hamano1-17/+18
2015-04-29merge: simplify code flowJunio C Hamano1-8/+8
2015-04-16Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano1-4/+0
2015-04-14Merge branch 'jk/merge-quiet'Junio C Hamano1-0/+4
2015-04-02merge: pass verbosity flag down to merge-recursiveJeff King1-0/+4
2015-01-14standardize usage info string formatAlex Henrie1-2/+2
2015-01-12Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano1-0/+1
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano1-2/+2
2014-12-29merge: release strbuf after use in suggest_conflicts()René Scharfe1-0/+1
2014-12-22Merge branch 'cc/interpret-trailers-more'Junio C Hamano1-15/+7
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano1-15/+7
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano1-2/+2
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano1-13/+5
2014-10-24builtin/merge.c: drop a parameter that is never usedJunio C Hamano1-2/+2
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-10-01try_merge_strategy(): use a statically-allocated lock_file objectMichael Haggerty1-7/+7
2014-10-01try_merge_strategy(): remove redundant lock_file allocationMichael Haggerty1-1/+0
2014-09-26Merge branch 'rs/realloc-array'Junio C Hamano1-1/+1
2014-09-19Merge branch 'ah/grammofix'Junio C Hamano1-2/+2
2014-09-18use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe1-1/+1
2014-09-02grammofix in user-facing messagesAlex Henrie1-2/+2
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe1-2/+1
2014-07-16Merge branch 'rs/code-cleaning'Junio C Hamano1-6/+4
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-8/+4
2014-07-10merge: simplify merge_trivial() by using commit_list_append()René Scharfe1-6/+4
2014-07-10Merge branch 'mg/verify-commit'Junio C Hamano1-4/+1
2014-07-02Merge branch 'jk/commit-buffer-length'Junio C Hamano1-4/+4
2014-06-23gpg-interface: provide clear helper for struct signature_checkMichael J Gruber1-4/+1
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-8/+4
2014-06-12commit_tree: take a pointer/len pair rather than a const strbufJeff King1-4/+4
2014-06-03Merge branch 'fc/merge-default-to-upstream'Junio C Hamano1-1/+1
2014-06-03Merge branch 'mh/ref-transaction'Junio C Hamano1-3/+3
2014-04-22merge: enable defaulttoupstream by defaultFelipe Contreras1-1/+1
2014-04-08Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano1-1/+1
2014-04-07refs.h: rename the action_on_err constantsMichael Haggerty1-3/+3
2014-03-28Merge branch 'bp/commit-p-editor'Junio C Hamano1-3/+3
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano1-1/+1
2014-03-18merge: fix GIT_EDITOR override for commit hookBenoit Pierre1-1/+1
2014-03-18commit: fix patch hunk editing with "commit -p -m"Benoit Pierre1-3/+3
2014-02-27Merge branch 'nv/commit-gpgsign-config'Junio C Hamano1-0/+3
2014-02-24commit-tree: add the commit.gpgsign option to sign all commitsNicolas Vigier1-0/+3
2014-01-27Merge branch 'ef/mingw-write'Junio C Hamano1-1/+1
2014-01-17prefer xwrite instead of writeErik Faye-Lund1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-6/+6
2013-10-31merge: simplify ff-only optionFelipe Contreras1-9/+2
2013-09-17Merge branch 'rh/ishes-doc'Junio C Hamano1-1/+1
2013-09-04use 'commit-ish' instead of 'committish'Richard Hansen1-1/+1
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller1-6/+6
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano1-1/+1
2013-07-15Merge branch 'mv/merge-ff-tristate'Junio C Hamano1-22/+33
2013-07-12Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano1-2/+2
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-1/+1
2013-07-03Change "remote tracking" to "remote-tracking"Michael Schubert1-2/+2
2013-07-02merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna1-22/+33
2013-05-08merge: use help_unknown_ref()Vikrant Varma1-1/+2
2013-04-05Merge branch 'sg/gpg-sig'Junio C Hamano1-1/+36
2013-04-05Merge branch 'jc/merge-tag-object'Junio C Hamano1-0/+13
2013-03-31merge/pull Check for untrusted good GPG signaturesSebastian Götte1-0/+3
2013-03-31merge/pull: verify GPG signatures of commits being mergedSebastian Götte1-1/+33
2013-03-19merge: a random object may not necssarily be a commitJunio C Hamano1-0/+13
2013-02-04Merge branch 'jc/custom-comment-char'Junio C Hamano1-3/+2
2013-01-16Allow custom "comment char"Junio C Hamano1-3/+2
2013-01-10Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano1-0/+1
2013-01-09Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Junio C Hamano1-2/+3
2013-01-03merge: Honor prepare-commit-msg return codeAntoine Pelisse1-2/+3
2012-12-28merge --no-edit: do not credit people involved in the side branchJunio C Hamano1-0/+1
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy1-104/+2
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano1-2/+1
2012-09-07Merge branch 'nd/i18n-parseopt-help'Junio C Hamano1-24/+24
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-2/+1
2012-08-20i18n: merge: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-24/+24
2012-08-03diff_setup_done(): return voidThomas Rast1-2/+1
2012-05-24ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King1-2/+2
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano1-54/+88
2012-04-17builtin/merge.c: reduce parents earlyJunio C Hamano1-25/+40
2012-04-17builtin/merge.c: collect other parents earlyJunio C Hamano1-13/+27
2012-04-17builtin/merge.c: remove "remoteheads" global variableJunio C Hamano1-23/+28
2012-04-02Sync with 1.7.9.6Junio C Hamano1-4/+1
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportJunio C Hamano1-1/+28
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano1-0/+2
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek1-0/+1
2012-03-01merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek1-0/+1
2012-02-27Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano1-0/+10
2012-02-23merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano1-1/+1
2012-02-12Merge branch 'jn/merge-no-edit-fix'Junio C Hamano1-1/+2
2012-02-10Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano1-1/+2
2012-02-09merge: do not launch an editor on "--no-edit $tag"Junio C Hamano1-3/+7
2012-02-05merge: do not create a signed tag merge under --ff-only optionJunio C Hamano1-1/+2
2012-01-31Merge branch 'tr/merge-edit-guidance'Junio C Hamano1-0/+10
2012-01-31Merge branch 'jc/pull-signed-tag'Junio C Hamano1-4/+34
2012-01-31merge: add instructions to the commit message when editingThomas Rast1-0/+10
2012-01-23merge: use editor by default in interactive sessionsJunio C Hamano1-4/+34
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano1-2/+12
2011-12-22Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano1-1/+1
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano1-2/+4
2011-12-19Merge branch 'nd/resolve-ref'Junio C Hamano1-7/+5
2011-12-18Update jk/maint-strbuf-missing-init to builtin/ renameJunio C Hamano1-0/+1292
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy1-2/+2
2011-12-15merge: abort if fails to commitNguyễn Thái Ngọc Duy1-2/+4
2011-12-13Merge branch 'nd/ignore-might-be-precious'Junio C Hamano1-4/+8
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy1-7/+5
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano1-24/+41
2011-12-09Merge branch 'jc/pull-signed-tag'Junio C Hamano1-45/+50
2011-12-09Merge branch 'jc/request-pull-show-head-4'Junio C Hamano1-10/+10
2011-12-05Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy1-22/+40
2011-12-05Merge branch 'nd/maint-ignore-exclude'Junio C Hamano1-1/+1
2011-12-05Merge branch 'vr/git-merge-default-to-upstream'Junio C Hamano1-3/+6
2011-11-28checkout,merge: disallow overwriting ignored files with --no-overwrite-ignoreNguyễn Thái Ngọc Duy1-4/+8
2011-11-28Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousJunio C Hamano1-1/+1
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy1-1/+1
2011-11-21Show error for 'git merge' with unset merge.defaultToUpstreamVincent van Ravesteijn1-3/+6
2011-11-17do not let git_path clobber errno when reporting errorsJonathan Nieder1-20/+29
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy1-2/+2
2011-11-12commit: teach --gpg-sign optionJunio C Hamano1-2/+14
2011-11-09merge: force edit and no-ff mode when merging a tag objectJunio C Hamano1-0/+6
2011-11-08merge: record tag objects without peeling in MERGE_HEADJunio C Hamano1-3/+10
2011-11-08merge: make usage of commit->util more extensibleJunio C Hamano1-40/+23
2011-11-07fmt-merge-msg: package options into a structureJunio C Hamano1-2/+6
2011-11-07merge: notice local merging of tags and keep it unwrappedJunio C Hamano1-0/+5
2011-10-21Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano1-56/+61
2011-10-19Merge branch 'js/merge-edit-option'Junio C Hamano1-39/+70
2011-10-13Merge branch 'nd/maint-autofix-tag-in-head'Junio C Hamano1-56/+61
2011-10-12Teach merge the '[-e|--edit]' optionJay Soffian1-39/+70
2011-10-07fmt-merge-msg: use branch.$name.descriptionJunio C Hamano1-10/+10
2011-10-05Merge branch 'jc/want-commit'Junio C Hamano1-5/+14
2011-09-18Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy1-5/+2
2011-09-18merge: remove global variable head[]Nguyễn Thái Ngọc Duy1-44/+53
2011-09-18merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy1-1/+1
2011-09-15Allow git merge ":/<pattern>"Junio C Hamano1-5/+14
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-6/+0
2011-08-26merge: keep stash[] a local variableNguyễn Thái Ngọc Duy1-17/+16
2011-08-25Merge branch 'jc/merge-reword'Junio C Hamano1-1/+1
2011-08-19want_color: automatically fallback to color.uiJeff King1-4/+0
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King1-2/+0
2011-05-31Merge branch 'jk/format-patch-am'Junio C Hamano1-1/+2
2011-05-26clean up calling conventions for pretty.c functionsJeff King1-1/+2
2011-05-25merge: reword the final messageJunio C Hamano1-1/+1
2011-05-19Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano1-2/+10
2011-05-16Merge branch 'mg/merge-ff-config'Junio C Hamano1-0/+9
2011-05-16cherry-pick: handle root commits with external strategiesJeff King1-2/+10
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano1-15/+26
2011-05-06merge: introduce merge.ff configuration variableJunio C Hamano1-0/+9
2011-05-06Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano1-15/+26
2011-05-02Merge branch 'ab/i18n-fixup'Junio C Hamano1-8/+8
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-07 22:09:09 +0000