summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)AuthorFilesLines
2020-09-03Merge branch 'pw/rebase-i-more-options'Libravatar Junio C Hamano1-6/+24
2020-08-17am: stop exporting GIT_COMMITTER_DATELibravatar Phillip Wood1-6/+24
2020-07-30strvec: rename struct fieldsLibravatar Jeff King1-8/+8
2020-07-28strvec: convert builtin/ callers away from argv_array nameLibravatar Jeff King1-33/+33
2020-07-28quote: rename sq_dequote_to_argv_array to mention strvecLibravatar Jeff King1-1/+1
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseLibravatar Junio C Hamano1-2/+1
2020-02-20am: support --show-current-patch=diff to retrieve .git/rebase-apply/patchLibravatar Paolo Bonzini1-2/+7
2020-02-20am: support --show-current-patch=raw as a synonym for--show-current-patchLibravatar Paolo Bonzini1-6/+53
2020-02-20am: convert "resume" variable to a structLibravatar Paolo Bonzini1-14/+18
2019-10-15Merge branch 'en/merge-recursive-cleanup'Libravatar Junio C Hamano1-1/+1
2019-10-11Merge branch 'rs/dedup-includes'Libravatar Junio C Hamano1-1/+0
2019-10-07Merge branch 'tg/stash-refresh-index'Libravatar Junio C Hamano1-14/+2
2019-10-04treewide: remove duplicate #include directivesLibravatar René Scharfe1-1/+0
2019-09-20factor out refresh_and_write_cache functionLibravatar Thomas Gummerer1-14/+2
2019-09-06git-am: handle missing "author" when parsing commitLibravatar Jeff King1-1/+3
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesLibravatar Derrick Stolee1-1/+1
2019-07-09Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-1/+1
2019-07-09Merge branch 'ds/close-object-store'Libravatar Junio C Hamano1-1/+1
2019-06-17Merge branch 'jk/am-i-resolved-fix'Libravatar Junio C Hamano1-11/+12
2019-06-12packfile: rename close_all_packs to close_object_storeLibravatar Derrick Stolee1-1/+1
2019-05-28am: fix --interactive HEAD tree resolutionLibravatar Jeff King1-3/+4
2019-05-28am: drop tty requirement for --interactiveLibravatar Jeff King1-3/+3
2019-05-28am: read interactive input from stdinLibravatar Jeff King1-2/+4
2019-05-28am: simplify prompt response handlingLibravatar Jeff King1-3/+1
2019-04-25Merge branch 'bc/hash-transition-16'Libravatar Junio C Hamano1-4/+5
2019-04-25Merge branch 'nd/diff-parseopt-4'Libravatar Junio C Hamano1-2/+2
2019-04-02checkout: inform the user when removing branch stateLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-04-01builtin/am: make hash size independentLibravatar brian m. carlson1-4/+5
2019-03-24am: avoid diff_opt_parse()Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2019-03-07Merge branch 'nd/completion-more-parameters'Libravatar Junio C Hamano1-0/+4
2019-03-07Merge branch 'jh/trace2'Libravatar Junio C Hamano1-0/+1
2019-03-07Merge branch 'wh/author-committer-ident-config'Libravatar Junio C Hamano1-0/+1
2019-02-22trace2:data: add trace2 hook classificationLibravatar Jeff Hostetler1-0/+1
2019-02-20completion: add more parameter value completionLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2019-02-06Merge branch 'nd/the-index-final'Libravatar Junio C Hamano1-6/+7
2019-02-06Merge branch 'tt/bisect-in-c'Libravatar Junio C Hamano1-18/+2
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Libravatar Junio C Hamano1-0/+9
2019-02-04config: allow giving separate author and committer identsLibravatar William Hubbs1-0/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2019-01-14read-cache.c: remove the_* from index_has_changes()Libravatar Nguyễn Thái Ngọc Duy1-3/+3
2019-01-14merge-recursive.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14read-cache.c: kill read_index()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14notes-utils.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'nd/the-index'Libravatar Junio C Hamano1-2/+2
2019-01-02wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()Libravatar Pranit Bauva1-18/+2
2018-12-28am, rebase--merge: do not overlook --skip'ed commits with post-rewriteLibravatar Elijah Newren1-0/+9
2018-11-18Merge branch 'jk/unused-parameter-fixes'Libravatar Junio C Hamano1-1/+3
2018-11-13Merge branch 'pw/am-rebase-read-author-script'Libravatar Junio C Hamano1-56/+4
2018-11-12rerere.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12branch.c: remove the_repository referenceLibravatar Nguyễn Thái Ngọc Duy1-1/+1