summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason2022-09-011-1/+1
* config: mark unused callback parametersJeff King2022-08-191-1/+1
* revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason2022-04-131-0/+3
* Merge branch 'ab/date-mode-release'Junio C Hamano2022-02-251-0/+1
|\
| * date API: create a date.h, split from cache.hÆvar Arnfjörð Bjarmason2022-02-161-0/+1
* | Merge branch 'ja/i18n-common-messages'Junio C Hamano2022-02-251-3/+5
|\ \ | |/ |/|
| * i18n: factorize "invalid value" messagesJean-Noël Avila2022-02-041-3/+5
* | Merge branch 'ab/config-based-hooks-2'Junio C Hamano2022-02-091-3/+3
|\ \ | |/ |/|
| * am: convert applypatch-msg to use hook.hEmily Shaffer2022-01-071-1/+1
| * am: convert {pre,post}-applypatch to use hook.hEmily Shaffer2022-01-071-2/+2
* | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-101-3/+3
|\ \
| * | i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila2022-01-051-3/+3
| |/
* | am: support --allow-empty to record specific empty patches徐沛文 (Aleen)2021-12-151-8/+24
* | am: support --empty=<option> to handle empty patches徐沛文 (Aleen)2021-12-151-5/+52
|/
* Merge branch 'ab/config-based-hooks-1'Junio C Hamano2021-10-131-0/+1
|\
| * hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason2021-09-271-0/+1
* | Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-131-1/+2
|\ \ | |/ |/|
| * Change unpack_trees' 'reset' flag into an enumElijah Newren2021-09-271-3/+2
| * Remove ignored files by default when they are in the wayElijah Newren2021-09-271-2/+1
| * unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-271-0/+3
| * Merge branch 'en/am-abort-fix' into en/removing-untracked-fixesJunio C Hamano2021-09-201-1/+2
| |\
* | \ Merge branch 'en/am-abort-fix'Junio C Hamano2021-09-231-1/+2
|\ \ \ | | |/ | |/|
| * | am: fix incorrect exit status on am fail to abortElijah Newren2021-09-101-1/+2
* | | Merge branch 'js/run-command-close-packs'Junio C Hamano2021-09-201-1/+0
|\ \ \ | |_|/ |/| |
| * | run_auto_maintenance(): implicitly close the object storeJohannes Schindelin2021-09-091-1/+0
| |/
* | advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-251-1/+1
|/
* *.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason2021-07-131-0/+1
* am: learn to process quoted lines that ends with CRLFĐoàn Trần Công Danh2021-05-101-0/+51
* builtin/*: update usage formatZheNing Hu2021-01-061-2/+2
* Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano2020-11-091-16/+3
|\
| * am, sequencer: stop parsing our own committer identJeff King2020-10-261-16/+3
* | Merge branch 'bk/sob-dco'Junio C Hamano2020-11-021-1/+1
|\ \
| * | Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn2020-10-201-1/+1
* | | Merge branch 'jk/committer-date-is-author-date-fix'Junio C Hamano2020-10-261-2/+2
|\ \ \ | |/ / |/| / | |/
| * am: fix broken email with --committer-date-is-author-dateJeff King2020-10-231-2/+2
* | assert PARSE_OPT_NONEG in parse-options callbacksJeff King2020-09-301-0/+2
* | Merge branch 'ds/maintenance-part-1'Junio C Hamano2020-09-251-1/+1
|\ \
| * | maintenance: replace run_auto_gc()Derrick Stolee2020-09-171-1/+1
* | | Merge branch 'pw/rebase-i-more-options'Junio C Hamano2020-09-031-6/+24
|\ \ \ | |/ / |/| / | |/
| * am: stop exporting GIT_COMMITTER_DATEPhillip Wood2020-08-171-6/+24
* | strvec: rename struct fieldsJeff King2020-07-301-8/+8
* | strvec: convert builtin/ callers away from argv_array nameJeff King2020-07-281-33/+33
* | quote: rename sq_dequote_to_argv_array to mention strvecJeff King2020-07-281-1/+1
* | auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano2020-05-071-2/+1
|/
* am: support --show-current-patch=diff to retrieve .git/rebase-apply/patchPaolo Bonzini2020-02-201-2/+7
* am: support --show-current-patch=raw as a synonym for--show-current-patchPaolo Bonzini2020-02-201-6/+53
* am: convert "resume" variable to a structPaolo Bonzini2020-02-201-14/+18
* Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2019-10-151-1/+1
|\
| * merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee2019-08-191-1/+1
* | Merge branch 'rs/dedup-includes'Junio C Hamano2019-10-111-1/+0
|\ \
View Lorry Controller Status