summaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano2023-04-171-17/+3
|\
| * sequencer: use struct strvec to store merge strategy optionsPhillip Wood2023-04-101-17/+3
* | Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+1
|\ \
| * | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
| |/
* | builtins: always pass prefix to parse_options()Jeff King2023-03-281-4/+5
|/
* alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-231-1/+2
* builtin/revert.c: move free-ing of "revs" to replay_opts_release()Ævar Arnfjörð Bjarmason2023-02-061-6/+0
* sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason2023-02-061-0/+2
* Merge branch 'ab/various-leak-fixes'Junio C Hamano2022-12-141-0/+4
|\
| * revert: fix parse_options_concat() leakÆvar Arnfjörð Bjarmason2022-11-211-0/+1
| * cherry-pick: free "struct replay_opts" membersÆvar Arnfjörð Bjarmason2022-11-211-0/+3
* | i18n: fix command template placeholder formatJean-Noël Avila2022-11-271-1/+1
|/
* doc txt & -h consistency: add missing options and labelsÆvar Arnfjörð Bjarmason2022-10-131-4/+5
* parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --optionsSZEDER Gábor2022-08-191-1/+1
* revert: free "struct replay_opts" membersÆvar Arnfjörð Bjarmason2022-07-011-0/+3
* revert: --reference should apply only to 'revert', not 'cherry-pick'Junio C Hamano2022-05-311-2/+7
* revert: optionally refer to commit in the "reference" formatJunio C Hamano2022-05-261-0/+2
* Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-201-0/+3
|\
| * sparse-index: integrate with cherry-pick and rebaseDerrick Stolee2021-09-091-0/+3
* | revision: separate walk and unsorted flagsPatrick Steinhardt2021-08-051-1/+2
|/
* sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren2021-03-311-3/+1
* Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano2020-11-181-0/+7
|\
| * merge,rebase,revert: select ort or recursive by config or environmentElijah Newren2020-11-021-0/+7
* | Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn2020-10-201-1/+1
|/
* Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano2019-07-191-0/+5
|\
| * cherry-pick/revert: add --skip optionRohit Ashiwal2019-07-021-0/+5
* | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-091-1/+1
|\ \ | |/ |/|
| * checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy2019-04-021-1/+1
* | cherry-pick/revert: add scissors line on merge conflictDenton Liu2019-04-191-0/+7
|/
* Merge branch 'nd/the-index'Junio C Hamano2019-01-041-4/+4
|\
| * branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy2018-11-121-1/+1
| * sequencer.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy2018-11-121-1/+1
| * sequencer.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-121-2/+2
* | parse-options: replace opterror() with optname()Nguyễn Thái Ngọc Duy2018-11-121-1/+2
|/
* revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
* Merge branch 'nd/cherry-pick-quit-fix'Junio C Hamano2018-08-201-2/+7
|\
| * cherry-pick: fix --quit not deleting CHERRY_PICK_HEADNguyễn Thái Ngọc Duy2018-08-161-2/+7
* | sequencer: improve config handlingPhillip Wood2017-12-131-13/+2
* | sequencer: load commit related configPhillip Wood2017-11-241-2/+13
|/
* cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdatePhillip Wood2017-08-021-0/+2
* config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* Merge branch 'jk/cherry-pick-0-mainline'Junio C Hamano2017-03-171-1/+20
|\
| * cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainlineJeff King2017-03-151-1/+20
* | sequencer: get rid of the subcommand fieldJohannes Schindelin2016-10-211-20/+16
* | sequencer: plug memory leaks for the option valuesJohannes Schindelin2016-10-211-0/+4
* | sequencer: use static initializers for replay_optsJohannes Schindelin2016-10-171-4/+2
|/
* parse_options: allocate a new array when concatenatingjk/parse-options-concatJeff King2016-07-061-9/+4
* standardize usage info string formatAlex Henrie2015-01-141-2/+2
* parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-241-1/+1
* cherry-pick, revert: add the --gpg-sign optionNicolas Vigier2014-01-271-0/+2
View Lorry Controller Status