summaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAgeFilesLines
* revert: do not rebuild argv on heapJonathan Nieder2010-06-291-16/+16
* revert: accept arbitrary rev-list optionsChristian Couder2010-06-251-1/+2
* revert: allow cherry-picking more than one commitChristian Couder2010-06-021-10/+41
* revert: change help_msg() to take no argumentChristian Couder2010-06-021-4/+4
* revert: refactor code into a do_pick_commit() functionChristian Couder2010-06-021-19/+25
* revert: use run_command_v_opt() instead of execv_git_cmd()Christian Couder2010-06-021-2/+9
* revert: cleanup code for -x optionChristian Couder2010-06-021-7/+1
* Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-081-74/+105
|\
| * revert: add "--strategy" option to choose merge strategyChristian Couder2010-04-011-2/+23
| * revert: refactor merge recursive code into its own functionChristian Couder2010-04-011-48/+58
| * revert: use strbuf to refactor the code that writes the merge messageChristian Couder2010-04-011-36/+34
* | cherry-pick: do not dump core when iconv failsJonathan Nieder2010-05-081-2/+7
* | Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-031-39/+64
|\ \ | |/
| * cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-201-1/+4
| * revert: clarify label on conflict hunksJonathan Nieder2010-03-201-39/+62
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-281-4/+42
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+460