summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)Author
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
2009-01-18Move run_hook() from builtin-commit.c into run-command.c (libgit)Stephan Beyer
2008-12-05Make some of fwrite/fclose/write/close failures visibleAlex Riesen
2008-11-15Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz
2008-10-19Merge branch 'mv/merge-noff'Junio C Hamano
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-10-09Merge branch 'mv/merge-refresh'Shawn O. Pearce
2008-10-09Merge branch 'maint'Shawn O. Pearce
2008-10-09builtin-merge.c: allocate correct amount of memoryBrandon Casey
2008-10-08Replace xmalloc/memset(0) pairs with xcallocBrandon Casey
2008-10-03builtin-commit: use reduce_heads() only when appropriateMiklos Vajna
2008-10-03builtin-merge: refresh the index before calling a strategyMiklos Vajna
2008-09-25Merge branch 'mv/merge-recursive'Shawn O. Pearce
2008-09-25Merge branch 'mv/commit-tree'Shawn O. Pearce
2008-09-25Merge branch 'maint'Shawn O. Pearce
2008-09-24maint: check return of split_cmdline to avoid bad config stringsDeskin Miller
2008-09-10commit_tree(): add a new author parameterMiklos Vajna
2008-09-07builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna
2008-08-31builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna
2008-08-29Remove useless memset of static command name lists in builtin-merge.cAlex Riesen
2008-08-29Remove calculation of the longest command name from where it is not usedAlex Riesen
2008-08-28Merge branch 'mv/merge-custom'Junio C Hamano
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-18 02:02:39 (GMT)