summaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAgeFilesLines
* cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-301-1/+1
* teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-301-1/+1
* Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-301-0/+8
|\
| * git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-241-1/+7
| * git-cherry-pick: add allow-empty optionNeil Horman2012-04-111-0/+2
* | Merge branch 'cb/cherry-pick-rev-path-confusion'Junio C Hamano2012-04-271-1/+4
|\ \
| * | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-151-1/+4
| |/
* | Merge branch 'cc/fix-missing-va-end-in-revert'Junio C Hamano2012-04-241-0/+1
|\ \ | |/ |/|
| * revert: add missing va_endChristian Couder2012-04-211-0/+1
* | sequencer: factor code out of revert builtinrr/sequencerRamkumar Ramachandra2012-01-111-946/+2
* | revert: prepare to move replay_action to headerRamkumar Ramachandra2012-01-111-18/+22
* | Merge branch 'rr/revert-cherry-pick'Junio C Hamano2011-12-221-23/+25
|\ \
| * | revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra2011-12-151-5/+5
| * | revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2011-12-151-6/+12
| * | revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2011-12-151-21/+16
| * | revert: free msg in format_todo()Ramkumar Ramachandra2011-12-151-0/+1
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-191-1/+1
|\ \ \ | |/ / |/| |
| * | revert: convert resolve_ref() to read_ref_full()Nguyễn Thái Ngọc Duy2011-12-121-1/+1
| |/
* | revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixesJonathan Nieder2011-12-121-3/+3
* | revert: do not remove state until sequence is finishedJonathan Nieder2011-12-121-11/+1
* | revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2011-12-121-0/+26
* | revert: pass around rev-list args in already-parsed formJonathan Nieder2011-12-121-24/+29
* | revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2011-12-121-3/+20
* | revert: give --continue handling its own functionJonathan Nieder2011-12-121-11/+17
|/
* revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2011-11-231-0/+1
* Fix revert --abort on WindowsJohannes Sixt2011-11-231-2/+2
* revert: do not pass non-literal string as format to git_path()Nguyễn Thái Ngọc Duy2011-11-231-1/+1
* revert: remove --reset compatibility optionjn/revert-quitJonathan Nieder2011-11-221-3/+0
* revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-221-3/+84
* revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-221-3/+5
* revert: improve error message for cherry-pick during cherry-pickJonathan Nieder2011-11-221-7/+6
* revert: rearrange pick_revisions() for clarityJonathan Nieder2011-11-221-24/+24
* revert: rename --reset option to --quitJonathan Nieder2011-11-221-11/+14
* do not let git_path clobber errno when reporting errorsjn/git-path-errnoJonathan Nieder2011-11-171-4/+5
* revert: prettify fatal messagesRamkumar Ramachandra2011-11-151-5/+5
* Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-191-7/+16
|\
| * Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-061-7/+16
| |\
| | * cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-puntedJay Soffian2011-10-061-5/+7
| | * revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-061-2/+9
* | | Merge branch 'jc/parse-options-boolean'Junio C Hamano2011-10-121-3/+1
|\ \ \
| * | | revert: use OPT_NOOP_NOARGRené Scharfe2011-09-281-3/+1
* | | | Fix some "variable might be used uninitialized" warningsRamsay Jones2011-10-091-1/+1
| |/ / |/| |
* | | Merge branch 'rr/revert-cherry-pick-continue'Junio C Hamano2011-10-051-154/+583
|\ \ \ | |/ / |/| |
| * | builtin/revert.c: make commit_list_append() staticJunio C Hamano2011-09-111-2/+2
| * | revert: Propagate errors upwards from do_pick_commitRamkumar Ramachandra2011-08-081-46/+40
| * | revert: Introduce --continue to continue the operationRamkumar Ramachandra2011-08-081-4/+184
| * | revert: Don't implicitly stomp pending sequencer operationRamkumar Ramachandra2011-08-081-5/+25
| * | revert: Remove sequencer state when no commits are pendingRamkumar Ramachandra2011-08-081-1/+11
| * | revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra2011-08-041-19/+43
| * | revert: Make pick_commits functionally act on a commit listRamkumar Ramachandra2011-08-041-15/+28
View Lorry Controller Status