aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/am.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2021-10-13Merge branch 'ab/config-based-hooks-1'Junio C Hamano1-0/+1
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano1-1/+2
2021-09-27Change unpack_trees' 'reset' flag into an enumElijah Newren1-3/+2
2021-09-27Remove ignored files by default when they are in the wayElijah Newren1-2/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren1-0/+3
2021-09-27hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason1-0/+1
2021-09-23Merge branch 'en/am-abort-fix'Junio C Hamano1-1/+2
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano1-1/+0
2021-09-20Merge branch 'en/am-abort-fix' into en/removing-untracked-fixesJunio C Hamano1-1/+2
2021-09-10am: fix incorrect exit status on am fail to abortElijah Newren1-1/+2
2021-09-09run_auto_maintenance(): implicitly close the object storeJohannes Schindelin1-1/+0
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel1-1/+1
2021-07-13*.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason1-0/+1
2021-05-10am: learn to process quoted lines that ends with CRLFĐoàn Trần Công Danh1-0/+51
2021-01-06builtin/*: update usage formatZheNing Hu1-2/+2
2020-11-09Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano1-16/+3
2020-11-02Merge branch 'bk/sob-dco'Junio C Hamano1-1/+1
2020-10-26Merge branch 'jk/committer-date-is-author-date-fix'Junio C Hamano1-2/+2
2020-10-26am, sequencer: stop parsing our own committer identJeff King1-16/+3
2020-10-23am: fix broken email with --committer-date-is-author-dateJeff King1-2/+2
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn1-1/+1
2020-09-30assert PARSE_OPT_NONEG in parse-options callbacksJeff King1-0/+2
2020-09-25Merge branch 'ds/maintenance-part-1'Junio C Hamano1-1/+1
2020-09-17maintenance: replace run_auto_gc()Derrick Stolee1-1/+1
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano1-6/+24
2020-08-17am: stop exporting GIT_COMMITTER_DATEPhillip Wood1-6/+24
2020-07-30strvec: rename struct fieldsJeff King1-8/+8
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King1-33/+33
2020-07-28quote: rename sq_dequote_to_argv_array to mention strvecJeff King1-1/+1
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano1-2/+1
2020-02-20am: support --show-current-patch=diff to retrieve .git/rebase-apply/patchPaolo Bonzini1-2/+7
2020-02-20am: support --show-current-patch=raw as a synonym for--show-current-patchPaolo Bonzini1-6/+53
2020-02-20am: convert "resume" variable to a structPaolo Bonzini1-14/+18
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano1-1/+1
2019-10-11Merge branch 'rs/dedup-includes'Junio C Hamano1-1/+0
2019-10-07Merge branch 'tg/stash-refresh-index'Junio C Hamano1-14/+2
2019-10-04treewide: remove duplicate #include directivesRené Scharfe1-1/+0
2019-09-20factor out refresh_and_write_cache functionThomas Gummerer1-14/+2
2019-09-06git-am: handle missing "author" when parsing commitJeff King1-1/+3
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee1-1/+1
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-1/+1
2019-07-09Merge branch 'ds/close-object-store'Junio C Hamano1-1/+1
2019-06-17Merge branch 'jk/am-i-resolved-fix'Junio C Hamano1-11/+12
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee1-1/+1
2019-05-28am: fix --interactive HEAD tree resolutionJeff King1-3/+4
2019-05-28am: drop tty requirement for --interactiveJeff King1-3/+3
2019-05-28am: read interactive input from stdinJeff King1-2/+4
2019-05-28am: simplify prompt response handlingJeff King1-3/+1
2019-04-25Merge branch 'bc/hash-transition-16'Junio C Hamano1-4/+5
2019-04-25Merge branch 'nd/diff-parseopt-4'Junio C Hamano1-2/+2