summaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-10-231-2/+2
|\
| * cherry-pick: handle "-" after parsing optionshu/cherry-pick-previous-branchJeff King2013-10-101-2/+2
* | Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-09-201-0/+2
|\ \ | |/
| * cherry-pick: allow "-" as abbreviation of '@{-1}'Hiroshige Umino2013-09-091-0/+2
* | revert: use the OPT_CMDMODE for parsing, reducing codesb/parseopt-boolean-removalStefan Beller2013-08-071-47/+15
* | Add the LAST_ARG_MUST_BE_NULL macrojk/gcc-function-attributesRamsay Jones2013-07-191-2/+2
* | use "sentinel" function attribute for variadic listsJeff King2013-07-091-0/+2
|/
* cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey2013-04-241-2/+2
* Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-101-1/+1
|\
| * 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 'nd/i18n-parseopt-help'Junio C Hamano2012-09-071-19/+19
|\ \
| * | i18n: revert, cherry-pick: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-18/+18
| |/
* | cherry-pick: add --allow-empty-message optionChris Webb2012-08-061-0/+2
|/
* 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