summaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
View Lorry Controller Status