aboutsummaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAge
* Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\
| * merge-recursive --renormalizeJonathan Nieder2010-08-06
* | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-31
|\ \
| * | cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-15
| * | cherry-pick/revert: Use error() for failure messageJonathan Nieder2010-08-15
| * | Introduce advise() to print hintsJonathan Nieder2010-08-15
| * | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-15
| * | revert: improve success message by adding abbreviated commit sha1Christian Couder2010-07-16
| * | revert: don't print "Finished one cherry-pick." if commit failedChristian Couder2010-07-16
| * | revert: refactor commit code into a new run_git_commit() functionChristian Couder2010-07-16
| * | revert: report success when using option --strategyChristian Couder2010-07-16
* | | Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-18
|\ \ \ | |/ / |/| |
| * | revert: rename variables related to subject in get_message()Christian Couder2010-07-23
| * | revert: refactor code to find commit subject in find_commit_subject()Christian Couder2010-07-23
| * | revert: fix off by one read when searching the end of a commit subjectChristian Couder2010-07-23
* | | revert: do not rebuild argv on heapJonathan Nieder2010-06-29
* | | revert: accept arbitrary rev-list optionsChristian Couder2010-06-25
| |/ |/|
* | revert: allow cherry-picking more than one commitChristian Couder2010-06-02
* | revert: change help_msg() to take no argumentChristian Couder2010-06-02
* | revert: refactor code into a do_pick_commit() functionChristian Couder2010-06-02
* | revert: use run_command_v_opt() instead of execv_git_cmd()Christian Couder2010-06-02
* | revert: cleanup code for -x optionChristian Couder2010-06-02
* | Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-08
|\ \ | |/ |/|
| * revert: add "--strategy" option to choose merge strategyChristian Couder2010-04-01
| * revert: refactor merge recursive code into its own functionChristian Couder2010-04-01
| * revert: use strbuf to refactor the code that writes the merge messageChristian Couder2010-04-01
* | cherry-pick: do not dump core when iconv failsJonathan Nieder2010-05-08
* | Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-03
|\ \ | |/
| * cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-20
| * revert: clarify label on conflict hunksJonathan Nieder2010-03-20
* | Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22