summaryrefslogtreecommitdiff
path: root/builtin/am.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy2019-01-141-1/+1
| * notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy2019-01-141-1/+1
* | Merge branch 'tt/bisect-in-c'Junio C Hamano2019-02-061-18/+2
|\ \
| * | wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()Pranit Bauva2019-01-021-18/+2
* | | Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano2019-02-061-0/+9
|\ \ \ | |_|/ |/| |
| * | am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren2018-12-281-0/+9
| |/
* | Merge branch 'nd/the-index'Junio C Hamano2019-01-041-2/+2
|\ \ | |/ |/|
| * rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
| * branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | Merge branch 'jk/unused-parameter-fixes'Junio C Hamano2018-11-181-1/+3
|\ \
| * | am: handle --no-patch-format optionJeff King2018-11-061-1/+3
| |/
* | Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano2018-11-131-56/+4
|\ \ | |/ |/|
| * add read_author_script() to libgitPhillip Wood2018-11-011-84/+2
| * am: rename read_author_script()Phillip Wood2018-11-011-2/+2
| * am: improve author-script error reportingPhillip Wood2018-11-011-10/+39
| * am: don't die in read_author_script()Phillip Wood2018-11-011-1/+2
* | Merge branch 'nd/status-refresh-progress'Junio C Hamano2018-10-191-1/+1
|\ \
| * | status: show progress bar if refreshing the index takes too longNguyễn Thái Ngọc Duy2018-09-171-1/+1
* | | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-5/+5
|\ \ \ | |_|/ |/| |
| * | revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+3
| * | rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
| |/
* | Merge branch 'rs/mailinfo-format-flowed'Junio C Hamano2018-09-171-0/+4
|\ \
| * | mailinfo: support format=flowedRené Scharfe2018-08-291-0/+4
* | | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-1/+1
|\ \ \ | |_|/ |/| |
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
* | | Merge branch 'en/directory-renames-nothanks'Junio C Hamano2018-09-041-0/+1
|\ \ \ | |/ / |/| |
| * | am: avoid directory rename detection when calling recursive merge machineryElijah Newren2018-08-301-0/+1
| |/
* | apply.c: make init_apply_state() take a struct repositoryNguyễn Thái Ngọc Duy2018-08-131-1/+1
* | Merge branch 'en/dirty-merge-fixes'Junio C Hamano2018-08-021-3/+4
|\ \
| * | merge-recursive: fix assumption that head tree being merged is HEADElijah Newren2018-07-111-3/+4
| * | index_has_changes(): avoid assuming operating on the_indexElijah Newren2018-07-031-3/+3
* | | commit: add repository argument to lookup_commitStefan Beller2018-06-291-1/+2
* | | tree: add repository argument to lookup_treeStefan Beller2018-06-291-2/+4
* | | Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-251-5/+1
|\ \ \ | |_|/ |/| |
| * | am: move advice.amWorkDir parsing back to advice.cNguyễn Thái Ngọc Duy2018-05-291-5/+1
* | | Merge branch 'nd/use-opt-int-set-f'Junio C Hamano2018-06-011-6/+6
|\ \ \
| * | | Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy2018-05-241-6/+6
| |/ /
* | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-4/+4
|\ \ \
| * | | builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algobrian m. carlson2018-05-021-4/+4
* | | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-10/+10
| |/ / |/| |
* | | exec_cmd: rename to use dash in file nameStefan Beller2018-04-111-1/+1
|/ /
* | Merge branch 'sb/object-store'Junio C Hamano2018-04-111-1/+1
|\ \
| * | object-store: close all packs upon clearing the object storeStefan Beller2018-03-261-1/+1
* | | cache-tree: convert write_*_as_tree to object_idbrian m. carlson2018-03-141-4/+4
| |/ |/|
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-4/+43
|\ \
| * | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+4
View Lorry Controller Status