summaryrefslogtreecommitdiff
path: root/builtin/revert.c
AgeCommit message (Expand)AuthorFilesLines
2011-10-19Merge branch 'js/no-cherry-pick-head-after-punted'Libravatar Junio C Hamano1-7/+16
2011-10-12Merge branch 'jc/parse-options-boolean'Libravatar Junio C Hamano1-3/+1
2011-10-09Fix some "variable might be used uninitialized" warningsLibravatar Ramsay Jones1-1/+1
2011-10-06Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Libravatar Junio C Hamano1-7/+16
2011-10-06cherry-pick: do not give irrelevant advice when cherry-pick puntedLibravatar Jay Soffian1-5/+7
2011-10-06revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soLibravatar Jay Soffian1-2/+9
2011-10-05Merge branch 'rr/revert-cherry-pick-continue'Libravatar Junio C Hamano1-154/+583
2011-09-28revert: use OPT_NOOP_NOARGLibravatar René Scharfe1-3/+1
2011-09-11builtin/revert.c: make commit_list_append() staticLibravatar Junio C Hamano1-2/+2
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Libravatar Junio C Hamano1-6/+1
2011-08-16revert: plug memory leak in "cherry-pick root commit" codepathLibravatar Jonathan Nieder1-6/+1
2011-08-08revert: Propagate errors upwards from do_pick_commitLibravatar Ramkumar Ramachandra1-46/+40
2011-08-08revert: Introduce --continue to continue the operationLibravatar Ramkumar Ramachandra1-4/+184
2011-08-08revert: Don't implicitly stomp pending sequencer operationLibravatar Ramkumar Ramachandra1-5/+25
2011-08-08revert: Remove sequencer state when no commits are pendingLibravatar Ramkumar Ramachandra1-1/+11
2011-08-04revert: Introduce --reset to remove sequencer stateLibravatar Ramkumar Ramachandra1-19/+43
2011-08-04revert: Make pick_commits functionally act on a commit listLibravatar Ramkumar Ramachandra1-15/+28
2011-08-04revert: Save command-line options for continuing operationLibravatar Ramkumar Ramachandra1-0/+33
2011-08-04revert: Save data for continuing after conflict resolutionLibravatar Ramkumar Ramachandra1-4/+130
2011-08-04revert: Don't create invalid replay_opts in parse_argsLibravatar Ramkumar Ramachandra1-11/+27
2011-08-04revert: Separate cmdline parsing from functional codeLibravatar Ramkumar Ramachandra1-7/+7
2011-08-04revert: Introduce struct to keep command-line optionsLibravatar Ramkumar Ramachandra1-88/+113
2011-08-04revert: Eliminate global "commit" variableLibravatar Ramkumar Ramachandra1-11/+11
2011-08-04revert: Rename no_replay to record_originLibravatar Ramkumar Ramachandra1-4/+4
2011-08-04revert: Don't check lone argument in get_encodingLibravatar Ramkumar Ramachandra1-3/+0
2011-08-04revert: Simplify and inline add_message_to_msgLibravatar Ramkumar Ramachandra1-14/+14
2011-08-04advice: Introduce error_resolve_conflictLibravatar Ramkumar Ramachandra1-9/+0
2011-05-16revert: allow reverting a root commitLibravatar Jeff King1-3/+1
2011-04-13revert: Hide '-r' option in default usageLibravatar Ramkumar Ramachandra1-1/+2
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-30/+42
2011-03-09i18n: git-revert split up "could not revert/apply" messageLibravatar Ævar Arnfjörð Bjarmason1-2/+3
2011-03-09i18n: git-revert literal "me" messagesLibravatar Ævar Arnfjörð Bjarmason1-2/+5
2011-03-09i18n: git-revert "Your local changes" messageLibravatar Ævar Arnfjörð Bjarmason1-5/+13
2011-03-09i18n: git-revert basic messagesLibravatar Ævar Arnfjörð Bjarmason1-23/+23
2011-03-09Merge branch 'js/cherry-pick-usability'Libravatar Junio C Hamano1-53/+22
2011-02-21Teach commit about CHERRY_PICK_HEADLibravatar Jay Soffian1-55/+1
2011-02-21Introduce CHERRY_PICK_HEADLibravatar Jay Soffian1-2/+25
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionLibravatar Jonathan Nieder1-7/+22
2010-11-29Merge branch 'jn/cherry-pick-refresh-index'Libravatar 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:24:01 +0000