summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation/git-submodule: cleanup "add" sectionks/submodule-add-docKaartic Sivaraam2017-06-221-28/+21
* Ninth batch for 2.14Junio C Hamano2017-06-191-0/+29
* Merge branch 'jk/consistent-h'Junio C Hamano2017-06-1912-13/+72
|\
| * t0012: test "-h" with builtinsjk/consistent-hJeff King2017-06-051-0/+12
| * git: add hidden --list-builtins optionJeff King2017-06-051-0/+12
| * version: convert to parse-optionsJeff King2017-06-051-5/+20
| * diff- and log- family: handle "git cmd -h" earlyJunio C Hamano2017-06-054-0/+12
| * submodule--helper: show usage for "-h"Jeff King2017-05-301-3/+2
| * remote-{ext,fd}: print usage message on invalid argumentsJeff King2017-05-302-2/+8
| * upload-archive: handle "-h" option earlyJeff King2017-05-301-1/+4
| * credential: handle invalid arguments earlierJeff King2017-05-301-2/+2
* | Merge branch 'ab/perf-remove-index-lock'Junio C Hamano2017-06-191-1/+8
|\ \
| * | perf: work around the tested repo having an index.lockab/perf-remove-index-lockÆvar Arnfjörð Bjarmason2017-06-051-1/+8
* | | Merge branch 'bw/object-id'Junio C Hamano2017-06-1936-525/+539
|\ \ \
| * | | diff: rename diff_fill_sha1_info to diff_fill_oid_infoBrandon Williams2017-06-051-9/+9
| * | | diffcore-rename: use is_empty_blob_oidBrandon Williams2017-06-051-2/+2
| * | | tree-diff: convert path_appendnew to object_idBrandon Williams2017-06-051-3/+3
| * | | tree-diff: convert diff_tree_paths to struct object_idBrandon Williams2017-06-053-38/+39
| * | | tree-diff: convert try_to_follow_renames to struct object_idBrandon Williams2017-06-051-3/+5
| * | | builtin/diff-tree: cleanup references to sha1Brandon Williams2017-06-051-5/+3
| * | | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-0516-46/+47
| * | | notes-merge: convert write_note_to_worktree to struct object_idBrandon Williams2017-06-051-10/+10
| * | | notes-merge: convert verify_notes_filepair to struct object_idBrandon Williams2017-06-051-10/+10
| * | | notes-merge: convert find_notes_merge_pair_ps to struct object_idBrandon Williams2017-06-051-12/+12
| * | | notes-merge: convert merge_from_diffs to struct object_idBrandon Williams2017-06-051-15/+16
| * | | notes-merge: convert notes_merge* to struct object_idBrandon Williams2017-06-053-42/+42
| * | | tree-diff: convert diff_root_tree_sha1 to struct object_idBrandon Williams2017-06-025-8/+8
| * | | combine-diff: convert find_paths_* to struct object_idBrandon Williams2017-06-021-6/+6
| * | | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-023-7/+7
| * | | diff: convert diff_flush_patch_id to struct object_idBrandon Williams2017-06-023-8/+8
| * | | patch-ids: convert to struct object_idBrandon Williams2017-06-023-13/+13
| * | | diff: finish conversion for prepare_temp_file to struct object_idBrandon Williams2017-06-021-2/+2
| * | | diff: convert reuse_worktree_file to struct object_idBrandon Williams2017-06-021-5/+5
| * | | diff: convert fill_filespec to struct object_idBrandon Williams2017-06-0210-21/+21
| * | | diff: convert diff_change to struct object_idBrandon Williams2017-06-025-20/+19
| * | | diff: convert run_diff_files to struct object_idBrandon Williams2017-06-021-6/+6
| * | | diff: convert diff_addremove to struct object_idBrandon Williams2017-06-025-17/+17
| * | | diff: convert diff_index_show_file to struct object_idBrandon Williams2017-06-021-5/+5
| * | | diff: convert get_stat_data to struct object_idBrandon Williams2017-06-021-13/+13
| * | | grep: convert to struct object_idBrandon Williams2017-06-024-21/+27
| * | | notes: convert some accessor functions to struct object_idbrian m. carlson2017-06-027-41/+41
| * | | builtin/notes: convert to struct object_idbrian m. carlson2017-06-025-60/+60
| * | | notes: convert format_display_notes to struct object_idbrian m. carlson2017-06-024-7/+7
| * | | notes: make get_note return pointer to struct object_idbrian m. carlson2017-06-025-28/+28
| * | | notes: convert for_each_note to struct object_idbrian m. carlson2017-06-024-21/+21
| * | | notes: convert internal parts to struct object_idbrian m. carlson2017-06-021-31/+33
| * | | notes: convert internal structures to struct object_idbrian m. carlson2017-06-021-47/+51
* | | | Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-06-191-4/+5
|\ \ \ \
| * | | | Documentation/git-rm: correct submodule descriptionsb/submodule-rm-absorbStefan Beller2017-06-041-4/+5
* | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-1910-29/+349
|\ \ \ \ \