summaryrefslogtreecommitdiff
path: root/builtin/revert.c
AgeCommit message (Expand)AuthorFilesLines
2012-03-20Merge branch 'maint-1.7.8' into maintLibravatar Junio C Hamano1-5/+4
2012-03-20Merge branch 'jc/advise-i18n' into maint-1.7.8Libravatar Junio C Hamano1-5/+4
2011-12-22Merge branch 'rr/revert-cherry-pick'Libravatar Junio C Hamano1-23/+25
2011-12-22i18n of multi-line advice messagesLibravatar Junio C Hamano1-5/+4
2011-12-19Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano1-1/+1
2011-12-15revert: simplify getting commit subject in format_todo()Libravatar Ramkumar Ramachandra1-5/+5
2011-12-15revert: tolerate extra spaces, tabs in insn sheetLibravatar Ramkumar Ramachandra1-6/+12
2011-12-15revert: make commit subjects in insn sheet optionalLibravatar Ramkumar Ramachandra1-21/+16
2011-12-15revert: free msg in format_todo()Libravatar Ramkumar Ramachandra1-0/+1
2011-12-12revert: stop creating and removing sequencer-old directoryLibravatar Jonathan Nieder1-3/+3
2011-12-12revert: do not remove state until sequence is finishedLibravatar Jonathan Nieder1-11/+1
2011-12-12revert: allow single-pick in the middle of cherry-pick sequenceLibravatar Jonathan Nieder1-0/+26
2011-12-12revert: pass around rev-list args in already-parsed formLibravatar Jonathan Nieder1-24/+29
2011-12-12revert: allow cherry-pick --continue to commit before resumingLibravatar Jonathan Nieder1-3/+20
2011-12-12revert: give --continue handling its own functionLibravatar Jonathan Nieder1-11/+17
2011-12-12revert: convert resolve_ref() to read_ref_full()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-11-23revert --abort: do not leave behind useless sequencer-old directoryLibravatar Jonathan Nieder1-0/+1
2011-11-23Fix revert --abort on WindowsLibravatar Johannes Sixt1-2/+2
2011-11-23revert: do not pass non-literal string as format to git_path()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-11-22revert: remove --reset compatibility optionLibravatar Jonathan Nieder1-3/+0
2011-11-22revert: introduce --abort to cancel a failed cherry-pickLibravatar Jonathan Nieder1-3/+84
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertLibravatar Jonathan Nieder1-3/+5
2011-11-22revert: improve error message for cherry-pick during cherry-pickLibravatar Jonathan Nieder1-7/+6
2011-11-22revert: rearrange pick_revisions() for clarityLibravatar Jonathan Nieder1-24/+24
2011-11-22revert: rename --reset option to --quitLibravatar Jonathan Nieder1-11/+14
2011-11-17do not let git_path clobber errno when reporting errorsLibravatar Jonathan Nieder1-4/+5
2011-11-15revert: prettify fatal messagesLibravatar Ramkumar Ramachandra1-5/+5
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