summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)AuthorFilesLines
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano1-3/+39
2010-01-20Merge branch 'jc/cache-unmerge'Libravatar Junio C Hamano1-3/+5
2010-01-20Merge branch 'mm/conflict-advice'Libravatar Junio C Hamano1-5/+14
2010-01-18Merge branch 'jc/rerere'Libravatar Junio C Hamano1-1/+3
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Libravatar Junio C Hamano1-2/+4
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-3/+37
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-5/+14
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionLibravatar Junio C Hamano1-1/+3
2009-12-25builtin-merge.c: use standard active_cache macrosLibravatar Junio C Hamano1-3/+2
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationLibravatar Junio C Hamano1-6/+0
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsLibravatar Junio C Hamano1-1/+3
2009-12-02Merge branch 'maint'Libravatar Junio C Hamano1-7/+9
2009-12-02merge: do not add standard message when message is given with -m optionLibravatar Junio C Hamano1-6/+8
2009-12-02Do not misidentify "git merge foo HEAD" as an old-style invocationLibravatar Junio C Hamano1-1/+1
2009-12-01Merge branch 'jc/deprecate-old-syntax-from-merge'Libravatar Junio C Hamano1-0/+6
2009-12-01git-merge: a deprecation notice of the ancient command line syntaxLibravatar Junio C Hamano1-0/+6
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Libravatar Junio C Hamano1-0/+1
2009-11-30Merge branch 'ap/maint-merge-strategy-list-fix'Libravatar Junio C Hamano1-1/+1
2009-11-29builtin-merge: show user-friendly error messages for fast-forward too.Libravatar Matthieu Moy1-0/+1
2009-11-29Merge remote branch 'ko/master' into HEADLibravatar Junio C Hamano1-8/+19
2009-11-29builtin-merge.c: call exclude_cmds() correctly.Libravatar Avery Pennarun1-1/+1
2009-11-15Merge branch 'fc/doc-fast-forward'Libravatar Junio C Hamano1-6/+6
2009-11-10Merge branch 'maint'Libravatar Junio C Hamano1-1/+0
2009-11-10Merge branch 'bg/merge-ff-only'Libravatar Junio C Hamano1-1/+10
2009-11-10merge: do not setup worktree twiceLibravatar Jonathan Nieder1-1/+0
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyLibravatar Björn Gustavsson1-1/+10
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-4/+4
2009-10-19Refactor pretty_print_commit arguments into a structLibravatar Thomas Rast1-2/+5
2009-08-16Merge branch 'jk/maint-merge-msg-fix'Libravatar Junio C Hamano1-8/+12
2009-08-10Merge branch 'js/run-command-updates'Libravatar Junio C Hamano1-1/+1
2009-08-09merge: indicate remote tracking branches in merge messageLibravatar Jeff King1-0/+5
2009-08-09merge: fix incorrect merge message for ambiguous tag/branchLibravatar Jeff King1-8/+7
2009-07-06Merge branch 'tr/die_errno'Libravatar Junio C Hamano1-13/+16
2009-07-05run_command: return exit code as positive valueLibravatar Johannes Sixt1-1/+1
2009-06-27Use die_errno() instead of die() when checking syscallsLibravatar Thomas Rast1-9/+12
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Libravatar Thomas Rast1-4/+4
2009-06-20Fix various sparse warnings in the git source codeLibravatar Linus Torvalds1-2/+2
2009-06-13Merge branch 'cb/maint-no-double-merge'Libravatar Junio C Hamano1-1/+4
2009-06-01refuse to merge during a mergeLibravatar Clemens Buchacher1-1/+4
2009-05-25parse-opts: prepare for OPT_FILENAMELibravatar Stephen Boyd1-2/+2
2009-04-28Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2009-04-28Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-1/+1
2009-04-28Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+1
2009-04-27builtin-merge: fix a typo in an error messageLibravatar Allan Caffee1-1/+1
2009-03-22strbuf_branchname(): a wrapper for branch name shorthandsLibravatar Junio C Hamano1-3/+2
2009-03-22Rename interpret/substitute nth_last_branch functionsLibravatar Junio C Hamano1-1/+1
2009-02-18Turn the flags in struct dir_struct into a single variableLibravatar Johannes Schindelin1-1/+1
2009-02-13Teach @{-1} to git mergeLibravatar Junio C Hamano1-3/+12
2009-02-04Replace deprecated dashed git commands in usageLibravatar Alexander Potashev1-2/+2
2009-01-17Move run_hook() from builtin-commit.c into run-command.c (libgit)Libravatar Stephan Beyer1-30/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 10:26:58 +0000