summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)AuthorFilesLines
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
2008-12-04Make some of fwrite/fclose/write/close failures visibleLibravatar Alex Riesen1-2/+4
2008-11-14Teach/Fix pull/fetch -q/-v optionsLibravatar Tuncer Ayaz1-7/+14
2008-10-19Merge branch 'mv/merge-noff'Libravatar Junio C Hamano1-0/+10
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerLibravatar Brandon Casey1-18/+9
2008-10-09Merge branch 'mv/merge-refresh'Libravatar Shawn O. Pearce1-0/+10
2008-10-09Merge branch 'maint'Libravatar Shawn O. Pearce1-2/+2
2008-10-09builtin-merge.c: allocate correct amount of memoryLibravatar Brandon Casey1-2/+2
2008-10-08Replace xmalloc/memset(0) pairs with xcallocLibravatar Brandon Casey1-2/+1
2008-10-03builtin-commit: use reduce_heads() only when appropriateLibravatar Miklos Vajna1-0/+10
2008-10-03builtin-merge: refresh the index before calling a strategyLibravatar Miklos Vajna1-0/+10
2008-09-25Merge branch 'mv/merge-recursive'Libravatar Shawn O. Pearce1-29/+64
2008-09-25Merge branch 'mv/commit-tree'Libravatar Shawn O. Pearce1-2/+2
2008-09-25Merge branch 'maint'Libravatar Shawn O. Pearce1-0/+2
2008-09-24maint: check return of split_cmdline to avoid bad config stringsLibravatar Deskin Miller1-0/+2
2008-09-10commit_tree(): add a new author parameterLibravatar Miklos Vajna1-2/+2
2008-09-06builtin-merge: release the lockfile in try_merge_strategy()Libravatar Miklos Vajna1-0/+1
2008-08-30builtin-merge: avoid run_command_v_opt() for recursive and subtreeLibravatar Miklos Vajna1-29/+63
2008-08-28Remove useless memset of static command name lists in builtin-merge.cLibravatar Alex Riesen1-2/+0
2008-08-28Remove calculation of the longest command name from where it is not usedLibravatar Alex Riesen1-4/+4
2008-08-27Merge branch 'mv/merge-custom'Libravatar Junio C Hamano1-7/+43
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Libravatar Junio C Hamano1-7/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 15:28:36 +0000