summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Fix typos in translatable strings for v2.21.0Jean-Noël Avila2019-02-113-4/+4
* Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano2019-02-081-21/+0
|\
| * Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin2019-02-061-21/+0
* | Merge branch 'nd/checkout-noisy-unmerge'Junio C Hamano2019-02-081-7/+12
|\ \
| * | checkout: count and print -m paths separatelyNguyễn Thái Ngọc Duy2019-02-061-3/+8
| * | checkout: update count-checkouts messagesNguyễn Thái Ngọc Duy2019-02-061-4/+4
* | | Merge branch 'ss/describe-dirty-in-the-right-directory'Junio C Hamano2019-02-061-0/+1
|\ \ \
| * | | describe: setup working tree for --dirtySebastian Staudt2019-02-041-0/+1
* | | | Merge branch 'sl/const'Junio C Hamano2019-02-063-10/+10
|\ \ \ \
| * | | | various: tighten constness of some local variablesShahzad Lone2019-02-043-10/+10
* | | | | Merge branch 'jk/loose-object-cache-oid'Junio C Hamano2019-02-066-12/+11
|\ \ \ \ \
| * | | | | convert has_sha1_file() callers to has_object_file()Jeff King2019-01-084-7/+6
| * | | | | update comment references to sha1_object_info()Jeff King2019-01-082-5/+5
* | | | | | Merge branch 'pw/rebase-x-sanity-check'Junio C Hamano2019-02-061-0/+17
|\ \ \ \ \ \
| * | | | | | rebase -x: sanity check commandPhillip Wood2019-01-291-0/+17
* | | | | | | Merge branch 'br/commit-tree-fully-spelled-gpg-sign-option'Junio C Hamano2019-02-061-1/+7
|\ \ \ \ \ \ \
| * | | | | | | commit-tree: add missing --gpg-sign flagBrandon Richardson2019-01-221-1/+7
* | | | | | | | Merge branch 'ds/push-sparse-tree-walk'Junio C Hamano2019-02-062-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-objects: create GIT_TEST_PACK_SPARSEDerrick Stolee2019-01-171-0/+1
| * | | | | | | | pack-objects: create pack.useSparse settingDerrick Stolee2019-01-171-0/+4
| * | | | | | | | list-objects: consume sparse tree walkDerrick Stolee2019-01-172-2/+5
* | | | | | | | | Merge branch 'lt/date-human'Junio C Hamano2019-02-061-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add 'human' date formatLinus Torvalds2019-01-181-0/+4
* | | | | | | | | | Merge branch 'jk/unused-parameter-cleanup'Junio C Hamano2019-02-061-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | create_bundle(): drop unused "header" parameterJeff King2019-01-241-2/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-0641-60/+111
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-2439-6/+42
| * | | | | | | | | | 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-144-4/+4
| * | | | | | | | | | sha1-name.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2019-01-144-5/+10
| * | | | | | | | | | read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy2019-01-144-6/+5
| * | | | | | | | | | read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy2019-01-144-7/+7
| * | | | | | | | | | checkout: avoid the_index when possibleNguyễn Thái Ngọc Duy2019-01-141-1/+1
| * | | | | | | | | | notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy2019-01-143-10/+15
| * | | | | | | | | | grep: use grep_opt->repo instead of explict repo argumentNguyễn Thái Ngọc Duy2019-01-141-17/+24
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/rebase-am'Junio C Hamano2019-02-061-125/+311
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | built-in rebase: call `git am` directlyJohannes Schindelin2019-01-181-0/+179
| * | | | | | | | | | rebase: teach `reset_head()` to optionally skip the worktreeJohannes Schindelin2019-01-181-1/+7
| * | | | | | | | | | rebase: avoid double reflog entry when switching branchesJohannes Schindelin2019-01-181-3/+4
| * | | | | | | | | | rebase: move `reset_head()` into a better spotJohannes Schindelin2019-01-181-119/+119
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tt/bisect-in-c'Junio C Hamano2019-02-062-22/+561
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | bisect--helper: `bisect_start` shell function partially in CPranit Bauva2019-01-021-2/+228
| * | | | | | | | | | bisect--helper: `get_terms` & `bisect_terms` shell function in CPranit Bauva2019-01-021-2/+60
| * | | | | | | | | | bisect--helper: `bisect_next_check` shell function in CPranit Bauva2019-01-021-1/+87
| * | | | | | | | | | bisect--helper: `check_and_set_terms` shell function in CPranit Bauva2019-01-021-1/+38
| * | | | | | | | | | wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()Pranit Bauva2019-01-021-18/+2
| * | | | | | | | | | bisect--helper: `bisect_write` shell function in CPranit Bauva2019-01-021-3/+102
| * | | | | | | | | | bisect--helper: `bisect_reset` shell function in CPranit Bauva2019-01-021-1/+50
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dt/cat-file-batch-ambiguous'Junio C Hamano2019-02-061-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not print 'dangling' for cat-file in case of ambiguityDavid Turner2019-01-181-1/+4
| | |_|/ / / / / / / | |/| | | | | | | |