summaryrefslogtreecommitdiff
path: root/builtin/am.c
AgeCommit message (Expand)Author
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-07-09Merge branch 'ds/close-object-store'Junio C Hamano
2019-06-17Merge branch 'jk/am-i-resolved-fix'Junio C Hamano
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee
2019-05-28am: fix --interactive HEAD tree resolutionJeff King
2019-05-28am: drop tty requirement for --interactiveJeff King
2019-05-28am: read interactive input from stdinJeff King
2019-05-28am: simplify prompt response handlingJeff King
2019-04-25Merge branch 'bc/hash-transition-16'Junio C Hamano
2019-04-25Merge branch 'nd/diff-parseopt-4'Junio C Hamano
2019-04-02checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy
2019-04-01builtin/am: make hash size independentbrian m. carlson
2019-03-24am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy
2019-03-07Merge branch 'nd/completion-more-parameters'Junio C Hamano
2019-03-07Merge branch 'jh/trace2'Junio C Hamano
2019-03-07Merge branch 'wh/author-committer-ident-config'Junio C Hamano
2019-02-22trace2:data: add trace2 hook classificationJeff Hostetler
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-02-07Merge branch 'tt/bisect-in-c'Junio C Hamano
2019-02-07Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano
2019-02-04config: allow giving separate author and committer identsWilliam Hubbs
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2019-01-14read-cache.c: remove the_* from index_has_changes()Nguyễn Thái Ngọc Duy
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy
2019-01-14notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2019-01-02wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()Pranit Bauva
2018-12-28am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren
2018-11-18Merge branch 'jk/unused-parameter-fixes'Junio C Hamano
2018-11-13Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano
2018-11-12rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-12branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy
2018-11-06am: handle --no-patch-format optionJeff King
2018-11-01add read_author_script() to libgitPhillip Wood
2018-11-01am: rename read_author_script()Phillip Wood
2018-11-01am: improve author-script error reportingPhillip Wood
2018-11-01am: don't die in read_author_script()Phillip Wood
2018-10-19Merge branch 'nd/status-refresh-progress'Junio C Hamano
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-17Merge branch 'rs/mailinfo-format-flowed'Junio C Hamano
2018-09-17Merge branch 'jk/cocci'Junio C Hamano
2018-09-17status: show progress bar if refreshing the index takes too longNguyễn Thái Ngọc Duy
2018-09-04Merge branch 'en/directory-renames-nothanks'Junio C Hamano
2018-08-30am: avoid directory rename detection when calling recursive merge machineryElijah Newren
2018-08-29mailinfo: support format=flowedRené Scharfe
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King