summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-configStephen Kent2017-04-284-3/+14
* status: fix missing newline when comment chars are disabledJeff King2017-04-282-5/+112
* Git 2.13-rc1v2.13.0-rc1Junio C Hamano2017-04-262-1/+40
* Merge branch 'mh/separate-ref-cache'Junio C Hamano2017-04-267-1089/+1066
|\
| * do_for_each_entry_in_dir(): delete functionmh/separate-ref-cacheMichael Haggerty2017-04-162-32/+0
| * files_pack_refs(): use reference iterationMichael Haggerty2017-04-161-83/+60
| * commit_packed_refs(): use reference iterationMichael Haggerty2017-04-161-21/+17
| * cache_ref_iterator_begin(): make function smarterMichael Haggerty2017-04-163-53/+56
| * get_loose_ref_cache(): new functionMichael Haggerty2017-04-161-2/+7
| * get_loose_ref_dir(): function renamed from get_loose_refs()Michael Haggerty2017-04-161-3/+3
| * do_for_each_entry_in_dir(): eliminate `offset` argumentMichael Haggerty2017-04-163-11/+10
| * refs: handle "refs/bisect/" in `loose_fill_ref_dir()`Michael Haggerty2017-04-162-16/+15
| * ref-cache: use a callback function to fill the cacheMichael Haggerty2017-04-163-13/+38
| * refs: record the ref_store in ref_cache, not ref_dirMichael Haggerty2017-04-163-11/+16
| * ref-cache: introduce a new type, ref_cacheMichael Haggerty2017-04-163-13/+46
| * refs: split `ref_cache` code into separate filesMichael Haggerty2017-04-164-733/+767
| * ref-cache: rename `remove_entry()` to `remove_entry_from_dir()`Michael Haggerty2017-04-161-2/+2
| * ref-cache: rename `find_ref()` to `find_ref_entry()`Michael Haggerty2017-04-161-3/+3
| * ref-cache: rename `add_ref()` to `add_ref_entry()`Michael Haggerty2017-04-161-4/+4
| * refs_verify_refname_available(): use function in more placesMichael Haggerty2017-04-161-160/+11
| * refs_verify_refname_available(): implement once for all backendsMichael Haggerty2017-04-164-41/+92
| * refs_ref_iterator_begin(): new functionMichael Haggerty2017-04-142-2/+24
| * refs_read_raw_ref(): new functionMichael Haggerty2017-04-142-2/+13
| * get_ref_dir(): don't call read_loose_refs() for "refs/bisect"Michael Haggerty2017-04-141-2/+0
* | Merge branch 'nd/worktree-add-lock'Junio C Hamano2017-04-263-5/+23
|\ \
| * | worktree add: add --lock optionnd/worktree-add-lockNguyễn Thái Ngọc Duy2017-04-203-5/+23
* | | Merge branch 'jk/update-links-in-docs'Junio C Hamano2017-04-266-14/+14
|\ \ \
| * | | docs/bisect-lk2009: update java code conventions linkJeff King2017-04-201-1/+1
| * | | docs/bisect-lk2009: update nist report linkJeff King2017-04-201-1/+1
| * | | docs/archimport: quote sourcecontrol.net referenceJeff King2017-04-201-1/+1
| * | | gitcore-tutorial: update broken linkJeff King2017-04-201-1/+1
| * | | doc: replace or.cz gitwiki link with git.wiki.kernel.orgJeff King2017-04-201-1/+1
| * | | doc: use https links to avoid http redirectJeff King2017-04-203-9/+9
* | | | Merge branch 'sf/putty-w-args'Junio C Hamano2017-04-261-1/+3
|\ \ \ \
| * | | | connect.c: fix leak in handle_ssh_variantsf/putty-w-argsJeff King2017-04-201-1/+3
* | | | | Merge branch 'ab/completion-push-delete-ref'Junio C Hamano2017-04-262-0/+35
|\ \ \ \ \
| * | | | | completion: expand "push --delete <remote> <ref>" for refs on that <remote>ab/completion-push-delete-refÆvar Arnfjörð Bjarmason2017-04-232-0/+35
* | | | | | Merge branch 'cc/split-index-config'Junio C Hamano2017-04-261-1/+2
|\ \ \ \ \ \
| * | | | | | read-cache: avoid using git_path() in freshen_shared_index()cc/split-index-configChristian Couder2017-04-201-1/+2
* | | | | | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-2610-30/+28
|\ \ \ \ \ \ \
| * | | | | | | am: drop "dir" parameter from am_state_initjk/war-on-git-pathJeff King2017-04-201-6/+4
| * | | | | | | replace strbuf_addstr(git_path()) with git_path_buf()Jeff King2017-04-202-6/+4
| * | | | | | | replace xstrdup(git_path(...)) with git_pathdup(...)Jeff King2017-04-202-3/+4
| * | | | | | | use git_path_* helper functionsJeff King2017-04-203-11/+11
| * | | | | | | branch: add edit_description() helperJeff King2017-04-201-3/+3
| * | | | | | | bisect: add git_path_bisect_terms helperJeff King2017-04-201-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jh/add-index-entry-optim'Junio C Hamano2017-04-2610-2/+446
|\ \ \ \ \ \ \
| * | | | | | | read-cache: speed up has_dir_name (part 2)jh/add-index-entry-optimJeff Hostetler2017-04-191-1/+62
| * | | | | | | read-cache: speed up has_dir_name (part 1)Jeff Hostetler2017-04-191-0/+45
| * | | | | | | read-cache: speed up add_index_entry during checkoutJeff Hostetler2017-04-191-1/+10