summaryrefslogtreecommitdiff
path: root/builtin-merge.c
Commit message (Expand)AuthorAgeFilesLines
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-1292/+0
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-3/+39
|\
| * Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-171-2/+4
| * git merge -X<option>Avery Pennarun2010-01-171-3/+37
| * Merge remote branch 'ko/master' into HEADJunio C Hamano2009-11-291-8/+19
| |\
* | \ Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-201-3/+5
|\ \ \
| * | | resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-251-1/+3
| * | | builtin-merge.c: use standard active_cache macrosJunio C Hamano2009-12-251-3/+2
* | | | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-5/+14
|\ \ \ \
| * | | | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-5/+14
| |/ / /
* | | | Merge branch 'jc/rerere'Junio C Hamano2010-01-181-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-1/+3
* | | | Revert recent "git merge <msg> HEAD <commit>..." deprecationJunio C Hamano2009-12-081-6/+0
|/ / /
* | | Merge branch 'maint'Junio C Hamano2009-12-021-7/+9
|\ \ \
| * | | merge: do not add standard message when message is given with -m optionJunio C Hamano2009-12-021-6/+8
| * | | Do not misidentify "git merge foo HEAD" as an old-style invocationJunio C Hamano2009-12-021-1/+1
* | | | Merge branch 'jc/deprecate-old-syntax-from-merge'Junio C Hamano2009-12-011-0/+6
|\ \ \ \
| * | | | git-merge: a deprecation notice of the ancient command line syntaxJunio C Hamano2009-12-011-0/+6
* | | | | Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano2009-11-301-0/+1
|\ \ \ \ \
| * | | | | builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy2009-11-291-0/+1
| |/ / / /
* | | | | Merge branch 'ap/maint-merge-strategy-list-fix'Junio C Hamano2009-11-301-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun2009-11-291-1/+1
| |/ /
* | | Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-151-6/+6
|\ \ \
| * | | Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-4/+4
| |/ /
* | | Merge branch 'maint'Junio C Hamano2009-11-101-1/+0
|\ \ \ | | |/ | |/|
| * | merge: do not setup worktree twiceJonathan Nieder2009-11-101-1/+0
| |/
* | Merge branch 'bg/merge-ff-only'Junio C Hamano2009-11-101-1/+10
|\ \
| * | Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-301-1/+10
| |/
* | Refactor pretty_print_commit arguments into a structThomas Rast2009-10-191-2/+5
|/
* Merge branch 'jk/maint-merge-msg-fix'Junio C Hamano2009-08-161-8/+12
|\
| * merge: indicate remote tracking branches in merge messageJeff King2009-08-091-0/+5
| * merge: fix incorrect merge message for ambiguous tag/branchJeff King2009-08-091-8/+7
* | Merge branch 'js/run-command-updates'Junio C Hamano2009-08-101-1/+1
|\ \ | |/ |/|
| * run_command: return exit code as positive valueJohannes Sixt2009-07-051-1/+1
* | Merge branch 'tr/die_errno'Junio C Hamano2009-07-061-13/+16
|\ \ | |/ |/|
| * Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-271-9/+12
| * Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-271-4/+4
* | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-201-2/+2
* | Merge branch 'cb/maint-no-double-merge'Junio C Hamano2009-06-131-1/+4
|\ \ | |/ |/|
| * refuse to merge during a mergeClemens Buchacher2009-06-011-1/+4
* | parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-2/+2
|/
* Merge branch 'maint'Junio C Hamano2009-04-281-1/+1
|\
| * Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-281-1/+1
| |\
| | * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-281-1/+1
| | |\
| | | * builtin-merge: fix a typo in an error messageAllan Caffee2009-04-271-1/+1
* | | | strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano2009-03-221-3/+2
* | | | Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-221-1/+1
* | | | Turn the flags in struct dir_struct into a single variableJohannes Schindelin2009-02-181-1/+1
|/ / /
* | | Teach @{-1} to git mergeJunio C Hamano2009-02-131-3/+12
* | | Replace deprecated dashed git commands in usageAlexander Potashev2009-02-041-2/+2
View Lorry Controller Status