aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-merge.c
AgeCommit message (Expand)AuthorFilesLines
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-1292/+0
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano1-3/+39
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano1-3/+5
2010-01-20Merge branch 'mm/conflict-advice'Junio C Hamano1-5/+14
2010-01-18Merge branch 'jc/rerere'Junio C Hamano1-1/+3
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano1-2/+4
2010-01-17git merge -X<option>Avery Pennarun1-3/+37
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy1-5/+14
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano1-1/+3
2009-12-25builtin-merge.c: use standard active_cache macrosJunio C Hamano1-3/+2
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano1-6/+0
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano1-1/+3
2009-12-02Merge branch 'maint'Junio C Hamano1-7/+9
2009-12-02merge: do not add standard message when message is given with -m optionJunio C Hamano1-6/+8
2009-12-02Do not misidentify "git merge foo HEAD" as an old-style invocationJunio C Hamano1-1/+1
2009-12-01Merge branch 'jc/deprecate-old-syntax-from-merge'Junio C Hamano1-0/+6
2009-12-01git-merge: a deprecation notice of the ancient command line syntaxJunio C Hamano1-0/+6
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano1-0/+1
2009-11-30Merge branch 'ap/maint-merge-strategy-list-fix'Junio C Hamano1-1/+1
2009-11-29builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy1-0/+1
2009-11-29Merge remote branch 'ko/master' into HEADJunio C Hamano1-8/+19
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun1-1/+1
2009-11-15Merge branch 'fc/doc-fast-forward'Junio C Hamano1-6/+6
2009-11-10Merge branch 'maint'Junio C Hamano1-1/+0
2009-11-10Merge branch 'bg/merge-ff-only'Junio C Hamano1-1/+10
2009-11-10merge: do not setup worktree twiceJonathan Nieder1-1/+0
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson1-1/+10
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras1-4/+4
2009-10-19Refactor pretty_print_commit arguments into a structThomas Rast1-2/+5
2009-08-16Merge branch 'jk/maint-merge-msg-fix'Junio C Hamano1-8/+12
2009-08-10Merge branch 'js/run-command-updates'Junio C Hamano1-1/+1
2009-08-09merge: indicate remote tracking branches in merge messageJeff King1-0/+5
2009-08-09merge: fix incorrect merge message for ambiguous tag/branchJeff King1-8/+7
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano1-13/+16
2009-07-05run_command: return exit code as positive valueJohannes Sixt1-1/+1
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast1-9/+12
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast1-4/+4
2009-06-20Fix various sparse warnings in the git source codeLinus Torvalds1-2/+2
2009-06-13Merge branch 'cb/maint-no-double-merge'Junio C Hamano1-1/+4
2009-06-01refuse to merge during a mergeClemens Buchacher1-1/+4
2009-05-25parse-opts: prepare for OPT_FILENAMEStephen Boyd1-2/+2
2009-04-28Merge branch 'maint'Junio C Hamano1-1/+1
2009-04-28Merge branch 'maint-1.6.1' into maintJunio C Hamano1-1/+1
2009-04-28Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+1
2009-04-27builtin-merge: fix a typo in an error messageAllan Caffee1-1/+1
2009-03-22strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano1-3/+2
2009-03-22Rename interpret/substitute nth_last_branch functionsJunio C Hamano1-1/+1
2009-02-18Turn the flags in struct dir_struct into a single variableJohannes Schindelin1-1/+1
2009-02-13Teach @{-1} to git mergeJunio C Hamano1-3/+12
2009-02-04Replace deprecated dashed git commands in usageAlexander Potashev1-2/+2
2009-01-17Move run_hook() from builtin-commit.c into run-command.c (libgit)Stephan Beyer1-30/+1
2008-12-04Make some of fwrite/fclose/write/close failures visibleAlex Riesen1-2/+4
2008-11-14Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz1-7/+14
2008-10-19Merge branch 'mv/merge-noff'Junio C Hamano1-0/+10
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey1-18/+9
2008-10-09Merge branch 'mv/merge-refresh'Shawn O. Pearce1-0/+10
2008-10-09Merge branch 'maint'Shawn O. Pearce1-2/+2
2008-10-09builtin-merge.c: allocate correct amount of memoryBrandon Casey1-2/+2
2008-10-08Replace xmalloc/memset(0) pairs with xcallocBrandon Casey1-2/+1
2008-10-03builtin-commit: use reduce_heads() only when appropriateMiklos Vajna1-0/+10
2008-10-03builtin-merge: refresh the index before calling a strategyMiklos Vajna1-0/+10
2008-09-25Merge branch 'mv/merge-recursive'Shawn O. Pearce1-29/+64
2008-09-25Merge branch 'mv/commit-tree'Shawn O. Pearce1-2/+2
2008-09-25Merge branch 'maint'Shawn O. Pearce1-0/+2
2008-09-24maint: check return of split_cmdline to avoid bad config stringsDeskin Miller1-0/+2
2008-09-10commit_tree(): add a new author parameterMiklos Vajna1-2/+2
2008-09-06builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna1-0/+1
2008-08-30builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna1-29/+63
2008-08-28Remove useless memset of static command name lists in builtin-merge.cAlex Riesen1-2/+0
2008-08-28Remove calculation of the longest command name from where it is not usedAlex Riesen1-4/+4
2008-08-27Merge branch 'mv/merge-custom'Junio C Hamano1-7/+43
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano1-7/+9
2008-08-23merge: fix numerus bugs around "trivial merge" areaJunio C Hamano1-7/+9
2008-08-21provide more errors for the "merge into empty head" casePaolo Bonzini1-0/+5
2008-08-20Fix "git-merge -s bogo" help textJunio C Hamano1-3/+11
2008-08-20"git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano1-1/+1
2008-07-30Fix merge name generation in "merge in C"Junio C Hamano1-2/+2
2008-07-29builtin-merge: allow using a custom strategyMiklos Vajna1-7/+35
2008-07-23Make non-static functions, that may be static, staticStephan Beyer1-1/+1
2008-07-21builtin-merge: add missing structure initializationPierre Habouzit1-0/+1
2008-07-21builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna1-25/+12
2008-07-20builtin-merge.c: Fix option parsingMichele Ballabio1-2/+3
2008-07-20Teach 'git merge' that some merge strategies no longer existMiklos Vajna1-2/+0
2008-07-15Merge branch 'mv/merge-in-c'Junio C Hamano1-0/+1156
2008-07-10Teach merge.log to "git-merge" againJunio C Hamano1-0/+2
2008-07-07Build in mergeMiklos Vajna1-0/+1153
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-04 19:10:20 +0000