summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)Author
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano
2010-01-20Merge branch 'mm/conflict-advice'Junio C Hamano
2010-01-19Merge branch 'jc/rerere'Junio C Hamano
2010-01-18Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano
2010-01-18git merge -X<option>Avery Pennarun
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy
2009-12-26resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano
2009-12-26builtin-merge.c: use standard active_cache macrosJunio C Hamano
2009-12-08Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano
2009-12-02Merge branch 'maint'Junio C Hamano
2009-12-02merge: do not add standard message when message is given with -m optionJunio C Hamano
2009-12-02Do not misidentify "git merge foo HEAD" as an old-style invocationJunio C Hamano
2009-12-01Merge branch 'jc/deprecate-old-syntax-from-merge'Junio C Hamano
2009-12-01git-merge: a deprecation notice of the ancient command line syntaxJunio C Hamano
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano
2009-11-30Merge branch 'ap/maint-merge-strategy-list-fix'Junio C Hamano
2009-11-30builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy
2009-11-30Merge remote branch 'ko/master' into HEADJunio C Hamano
2009-11-30builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun
2009-11-16Merge branch 'fc/doc-fast-forward'Junio C Hamano
2009-11-10Merge branch 'maint'Junio C Hamano
2009-11-10Merge branch 'bg/merge-ff-only'Junio C Hamano
2009-11-10merge: do not setup worktree twiceJonathan Nieder
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson
2009-10-25Use 'fast-forward' all over the placeFelipe Contreras
2009-10-20Refactor pretty_print_commit arguments into a structThomas Rast
2009-08-16Merge branch 'jk/maint-merge-msg-fix'Junio C Hamano
2009-08-11Merge branch 'js/run-command-updates'Junio C Hamano
2009-08-09merge: indicate remote tracking branches in merge messageJeff King
2009-08-09merge: fix incorrect merge message for ambiguous tag/branchJeff King
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano
2009-07-05run_command: return exit code as positive valueJohannes Sixt
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast
2009-06-21Fix various sparse warnings in the git source codeLinus Torvalds
2009-06-13Merge branch 'cb/maint-no-double-merge'Junio C Hamano
2009-06-02refuse to merge during a mergeClemens Buchacher
2009-05-25parse-opts: prepare for OPT_FILENAMEStephen Boyd
2009-04-28Merge branch 'maint'Junio C Hamano
2009-04-28Merge branch 'maint-1.6.1' into maintJunio C Hamano
2009-04-28Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano
2009-04-27builtin-merge: fix a typo in an error messageAllan Caffee
2009-03-23strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano
2009-03-23Rename interpret/substitute nth_last_branch functionsJunio C Hamano
2009-02-18Turn the flags in struct dir_struct into a single variableJohannes Schindelin
2009-02-14Teach @{-1} to git mergeJunio C Hamano
2009-02-04Replace deprecated dashed git commands in usageAlexander Potashev