summaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAgeFilesLines
...
| * | revert: Save command-line options for continuing operationRamkumar Ramachandra2011-08-041-0/+33
| * | revert: Save data for continuing after conflict resolutionRamkumar Ramachandra2011-08-041-4/+130
| * | revert: Don't create invalid replay_opts in parse_argsRamkumar Ramachandra2011-08-041-11/+27
| * | revert: Separate cmdline parsing from functional codeRamkumar Ramachandra2011-08-041-7/+7
| * | revert: Introduce struct to keep command-line optionsRamkumar Ramachandra2011-08-041-88/+113
| * | revert: Eliminate global "commit" variableRamkumar Ramachandra2011-08-041-11/+11
| * | revert: Rename no_replay to record_originRamkumar Ramachandra2011-08-041-4/+4
| * | revert: Don't check lone argument in get_encodingRamkumar Ramachandra2011-08-041-3/+0
| * | revert: Simplify and inline add_message_to_msgRamkumar Ramachandra2011-08-041-14/+14
| * | advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-041-9/+0
| |/
* | Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano2011-08-251-6/+1
|\ \ | |/ |/|
| * revert: plug memory leak in "cherry-pick root commit" codepathJonathan Nieder2011-08-161-6/+1
* | revert: allow reverting a root commitJeff King2011-05-161-3/+1
* | revert: Hide '-r' option in default usageRamkumar Ramachandra2011-04-131-1/+2
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-30/+42
|\ \
| * | i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason2011-03-091-2/+3
| * | i18n: git-revert literal "me" messagesÆvar Arnfjörð Bjarmason2011-03-091-2/+5
| * | i18n: git-revert "Your local changes" messageÆvar Arnfjörð Bjarmason2011-03-091-5/+13
| * | i18n: git-revert basic messagesÆvar Arnfjörð Bjarmason2011-03-091-23/+23
* | | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-091-53/+22
|\ \ \ | |/ / |/| |
| * | Teach commit about CHERRY_PICK_HEADJay Soffian2011-02-211-55/+1
| * | Introduce CHERRY_PICK_HEADJay Soffian2011-02-211-2/+25
* | | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-281-7/+22
|/ /
* | Merge branch 'jn/cherry-pick-refresh-index'Junio C Hamano2010-11-291-2/+16
|\ \
| * | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-101-2/+16
* | | builtin/revert.c: don't dereference a NULL pointerBrandon Casey2010-09-271-1/+1
|/ /
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-0/+7
|\ \
| * | merge-recursive --renormalizeJonathan Nieder2010-08-061-0/+7
| |/
* | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-311-69/+70
|\ \
| * | cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-151-23/+11
| * | cherry-pick/revert: Use error() for failure messageJonathan Nieder2010-08-151-2/+5
| * | Introduce advise() to print hintsJonathan Nieder2010-08-151-0/+9
| * | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-151-2/+0
| * | revert: improve success message by adding abbreviated commit sha1Christian Couder2010-07-161-2/+3
| * | revert: don't print "Finished one cherry-pick." if commit failedChristian Couder2010-07-161-12/+5
| * | revert: refactor commit code into a new run_git_commit() functionChristian Couder2010-07-161-25/+27
| * | revert: report success when using option --strategyChristian Couder2010-07-161-22/+29
* | | Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-181-15/+5
|\ \ \ | |/ / |/| |
| * | revert: rename variables related to subject in get_message()Christian Couder2010-07-231-5/+5
| * | revert: refactor code to find commit subject in find_commit_subject()Christian Couder2010-07-231-12/+2
| * | revert: fix off by one read when searching the end of a commit subjectChristian Couder2010-07-231-1/+1
* | | 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