aboutsummaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAge
* Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-10
|\
| * cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-30
| * teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-30
* | Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-07
|\ \
| * | i18n: revert, cherry-pick: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
| |/
* | cherry-pick: add --allow-empty-message optionChris Webb2012-08-06
|/
* Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-30
|\
| * git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-24
| * git-cherry-pick: add allow-empty optionNeil Horman2012-04-11
* | Merge branch 'cb/cherry-pick-rev-path-confusion'Junio C Hamano2012-04-27
|\ \
| * | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-15
| |/
* | Merge branch 'cc/fix-missing-va-end-in-revert'Junio C Hamano2012-04-24
|\ \ | |/ |/|
| * revert: add missing va_endChristian Couder2012-04-21
* | sequencer: factor code out of revert builtinRamkumar Ramachandra2012-01-11
* | revert: prepare to move replay_action to headerRamkumar Ramachandra2012-01-11
* | Merge branch 'rr/revert-cherry-pick'Junio C Hamano2011-12-22
|\ \
| * | revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra2011-12-15
| * | revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2011-12-15
| * | revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2011-12-15
| * | revert: free msg in format_todo()Ramkumar Ramachandra2011-12-15
* | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-19
|\ \ \ | |/ / |/| |
| * | revert: convert resolve_ref() to read_ref_full()Nguyễn Thái Ngọc Duy2011-12-12
| |/
* | revert: stop creating and removing sequencer-old directoryJonathan Nieder2011-12-12
* | revert: do not remove state until sequence is finishedJonathan Nieder2011-12-12
* | revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2011-12-12
* | revert: pass around rev-list args in already-parsed formJonathan Nieder2011-12-12
* | revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2011-12-12
* | revert: give --continue handling its own functionJonathan Nieder2011-12-12
|/
* revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2011-11-23
* Fix revert --abort on WindowsJohannes Sixt2011-11-23
* revert: do not pass non-literal string as format to git_path()Nguyễn Thái Ngọc Duy2011-11-23
* revert: remove --reset compatibility optionJonathan Nieder2011-11-22
* revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-22
* revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-22
* revert: improve error message for cherry-pick during cherry-pickJonathan Nieder2011-11-22
* revert: rearrange pick_revisions() for clarityJonathan Nieder2011-11-22
* revert: rename --reset option to --quitJonathan Nieder2011-11-22
* do not let git_path clobber errno when reporting errorsJonathan Nieder2011-11-17
* revert: prettify fatal messagesRamkumar Ramachandra2011-11-15
* Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-19
|\
| * Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-06
| |\
| | * cherry-pick: do not give irrelevant advice when cherry-pick puntedJay Soffian2011-10-06
| | * revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-06
* | | Merge branch 'jc/parse-options-boolean'Junio C Hamano2011-10-12
|\ \ \
| * | | revert: use OPT_NOOP_NOARGRené Scharfe2011-09-28
* | | | Fix some "variable might be used uninitialized" warningsRamsay Jones2011-10-09
| |/ / |/| |
* | | Merge branch 'rr/revert-cherry-pick-continue'Junio C Hamano2011-10-05
|\ \ \ | |/ / |/| |
| * | builtin/revert.c: make commit_list_append() staticJunio C Hamano2011-09-11
| * | revert: Propagate errors upwards from do_pick_commitRamkumar Ramachandra2011-08-08
| * | revert: Introduce --continue to continue the operationRamkumar Ramachandra2011-08-08