aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge.c
Commit message (Expand)AuthorAge
* Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-15
|\
| * Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
* | Merge branch 'maint'Junio C Hamano2009-11-10
|\ \
| * | merge: do not setup worktree twiceJonathan Nieder2009-11-10
| |/
* | Merge branch 'bg/merge-ff-only'Junio C Hamano2009-11-10
|\ \
| * | Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-30
| |/
* | Refactor pretty_print_commit arguments into a structThomas Rast2009-10-19
|/
* Merge branch 'jk/maint-merge-msg-fix'Junio C Hamano2009-08-16
|\
| * merge: indicate remote tracking branches in merge messageJeff King2009-08-09
| * merge: fix incorrect merge message for ambiguous tag/branchJeff King2009-08-09
* | Merge branch 'js/run-command-updates'Junio C Hamano2009-08-10
|\ \ | |/ |/|
| * run_command: return exit code as positive valueJohannes Sixt2009-07-05
* | Merge branch 'tr/die_errno'Junio C Hamano2009-07-06
|\ \ | |/ |/|
| * Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-27
| * Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-27
* | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-20
* | Merge branch 'cb/maint-no-double-merge'Junio C Hamano2009-06-13
|\ \ | |/ |/|
| * refuse to merge during a mergeClemens Buchacher2009-06-01
* | parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-25
|/
* Merge branch 'maint'Junio C Hamano2009-04-28
|\
| * Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-28
| |\
| | * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-28
| | |\
| | | * builtin-merge: fix a typo in an error messageAllan Caffee2009-04-27
* | | | strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano2009-03-22
* | | | Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-22
* | | | Turn the flags in struct dir_struct into a single variableJohannes Schindelin2009-02-18
|/ / /
* | | Teach @{-1} to git mergeJunio C Hamano2009-02-13
* | | Replace deprecated dashed git commands in usageAlexander Potashev2009-02-04
* | | Move run_hook() from builtin-commit.c into run-command.c (libgit)Stephan Beyer2009-01-17
|/ /
* | Make some of fwrite/fclose/write/close failures visibleAlex Riesen2008-12-04
* | Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-14
* | Merge branch 'mv/merge-noff'Junio C Hamano2008-10-19
|\ \
| * | builtin-commit: use reduce_heads() only when appropriateMiklos Vajna2008-10-03
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-12
* | | Merge branch 'mv/merge-refresh'Shawn O. Pearce2008-10-09
|\ \ \
| * | | builtin-merge: refresh the index before calling a strategyMiklos Vajna2008-10-03
| |/ /
* | | Merge branch 'maint'Shawn O. Pearce2008-10-09
|\ \ \ | | |/ | |/|
| * | builtin-merge.c: allocate correct amount of memoryBrandon Casey2008-10-09
* | | Replace xmalloc/memset(0) pairs with xcallocBrandon Casey2008-10-08
| |/ |/|
* | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-25
|\ \
| * | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-06
| * | builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna2008-08-30
* | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-25
|\ \ \
| * | | commit_tree(): add a new author parameterMiklos Vajna2008-09-10
| |/ /
* | | Merge branch 'maint'Shawn O. Pearce2008-09-25
|\ \ \ | |/ / |/| / | |/
| * maint: check return of split_cmdline to avoid bad config stringsDeskin Miller2008-09-24
* | Remove useless memset of static command name lists in builtin-merge.cAlex Riesen2008-08-28
* | Remove calculation of the longest command name from where it is not usedAlex Riesen2008-08-28
* | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-27
|\ \
| * | Fix "git-merge -s bogo" help textJunio C Hamano2008-08-20
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 04:49:06 +0000