summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | treewide: remove duplicate #include directivesRené Scharfe2019-10-041-1/+0
* | | Merge branch 'tg/stash-refresh-index'Junio C Hamano2019-10-071-14/+2
|\ \ \ | |/ / |/| |
| * | factor out refresh_and_write_cache functionThomas Gummerer2019-09-201-14/+2
| |/
* | git-am: handle missing "author" when parsing commitJeff King2019-09-061-1/+3
|/
* 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
* | Merge branch 'ds/close-object-store'Junio C Hamano2019-07-091-1/+1
|\ \
| * | packfile: rename close_all_packs to close_object_storeDerrick Stolee2019-06-121-1/+1
* | | Merge branch 'jk/am-i-resolved-fix'Junio C Hamano2019-06-171-11/+12
|\ \ \
| * | | am: fix --interactive HEAD tree resolutionJeff King2019-05-281-3/+4
| * | | am: drop tty requirement for --interactiveJeff King2019-05-281-3/+3
| * | | am: read interactive input from stdinJeff King2019-05-281-2/+4
| * | | am: simplify prompt response handlingJeff King2019-05-281-3/+1
| |/ /
* | | Merge branch 'bc/hash-transition-16'Junio C Hamano2019-04-251-4/+5
|\ \ \
| * | | builtin/am: make hash size independentbrian m. carlson2019-04-011-4/+5
| | |/ | |/|
* | | Merge branch 'nd/diff-parseopt-4'Junio C Hamano2019-04-251-2/+2
|\ \ \ | |/ / |/| |
| * | am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-2/+2
* | | Merge branch 'nd/completion-more-parameters'Junio C Hamano2019-03-071-0/+4
|\ \ \
| * | | completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-201-0/+4
| | |/ | |/|
* | | Merge branch 'jh/trace2'Junio C Hamano2019-03-071-0/+1
|\ \ \
| * | | trace2:data: add trace2 hook classificationJeff Hostetler2019-02-221-0/+1
| |/ /
* | | Merge branch 'wh/author-committer-ident-config'Junio C Hamano2019-03-071-0/+1
|\ \ \ | |/ / |/| |
| * | config: allow giving separate author and committer identsWilliam Hubbs2019-02-041-0/+1
| |/
* | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-6/+7
|\ \
| * | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
| * | read-cache.c: remove the_* from index_has_changes()Nguyễn Thái Ngọc Duy2019-01-141-3/+3
| * | merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2019-01-141-1/+1
View Lorry Controller Status