summaryrefslogtreecommitdiff
path: root/builtin/revert.c
AgeCommit message (Expand)AuthorFilesLines
2010-12-09Merge branch 'jn/cherry-pick-refresh-index' into maintLibravatar Junio C Hamano1-2/+16
2010-11-10cherry-pick/revert: transparently refresh indexLibravatar Jonathan Nieder1-2/+16
2010-09-27builtin/revert.c: don't dereference a NULL pointerLibravatar Brandon Casey1-1/+1
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+7
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Libravatar Junio C Hamano1-69/+70
2010-08-18Merge branch 'cc/find-commit-subject'Libravatar Junio C Hamano1-15/+5
2010-08-15cherry-pick/revert: Use advise() for hintsLibravatar Jonathan Nieder1-23/+11
2010-08-15cherry-pick/revert: Use error() for failure messageLibravatar Jonathan Nieder1-2/+5
2010-08-15Introduce advise() to print hintsLibravatar Jonathan Nieder1-0/+9
2010-08-15Eliminate “Finished cherry-pick/revert” messageLibravatar Jonathan Nieder1-2/+0
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder1-0/+7
2010-07-23revert: rename variables related to subject in get_message()Libravatar Christian Couder1-5/+5
2010-07-23revert: refactor code to find commit subject in find_commit_subject()Libravatar Christian Couder1-12/+2
2010-07-23revert: fix off by one read when searching the end of a commit subjectLibravatar Christian Couder1-1/+1
2010-07-16revert: improve success message by adding abbreviated commit sha1Libravatar Christian Couder1-2/+3
2010-07-16revert: don't print "Finished one cherry-pick." if commit failedLibravatar Christian Couder1-12/+5
2010-07-16revert: refactor commit code into a new run_git_commit() functionLibravatar Christian Couder1-25/+27
2010-07-16revert: report success when using option --strategyLibravatar Christian Couder1-22/+29
2010-06-29revert: do not rebuild argv on heapLibravatar Jonathan Nieder1-16/+16
2010-06-25revert: accept arbitrary rev-list optionsLibravatar Christian Couder1-1/+2
2010-06-02revert: allow cherry-picking more than one commitLibravatar Christian Couder1-10/+41
2010-06-02revert: change help_msg() to take no argumentLibravatar Christian Couder1-4/+4
2010-06-02revert: refactor code into a do_pick_commit() functionLibravatar Christian Couder1-19/+25
2010-06-02revert: use run_command_v_opt() instead of execv_git_cmd()Libravatar Christian Couder1-2/+9
2010-06-02revert: cleanup code for -x optionLibravatar Christian Couder1-7/+1
2010-05-08Merge branch 'cc/revert-strategy'Libravatar Junio C Hamano1-74/+105
2010-05-08cherry-pick: do not dump core when iconv failsLibravatar Jonathan Nieder1-2/+7
2010-04-03Merge branch 'jn/merge-diff3-label'Libravatar Junio C Hamano1-39/+64
2010-04-01revert: add "--strategy" option to choose merge strategyLibravatar Christian Couder1-2/+23
2010-04-01revert: refactor merge recursive code into its own functionLibravatar Christian Couder1-48/+58
2010-04-01revert: use strbuf to refactor the code that writes the merge messageLibravatar Christian Couder1-36/+34
2010-03-28Merge branch 'cc/cherry-pick-ff'Libravatar Junio C Hamano1-4/+42
2010-03-20cherry-pick, revert: add a label for ancestorLibravatar Jonathan Nieder1-1/+4
2010-03-20revert: clarify label on conflict hunksLibravatar Jonathan Nieder1-39/+62
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+460