summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | files-backend.c: delete dead code in files_ref_iterator_begin()Nguyễn Thái Ngọc Duy2017-03-271-3/+0
| * | | | | | | | | files-backend: make files_log_ref_write() staticNguyễn Thái Ngọc Duy2017-03-272-7/+6
| * | | | | | | | | refs.h: add forward declaration for structs used in this fileNguyễn Thái Ngọc Duy2017-03-181-0/+4
* | | | | | | | | | Merge branch 'bw/submodule-is-active'Junio C Hamano2017-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule--helper: fix typo in is_active error messagebw/submodule-is-activeStefan Beller2017-04-131-1/+1
* | | | | | | | | | | Merge branch 'va/i18n-perl-scripts'Junio C Hamano2017-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-add--interactive.perl: add missing dot in a messageva/i18n-perl-scriptsRalf Thielow2017-04-131-1/+1
* | | | | | | | | | | | Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-04-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule.c: add missing ' in error messagesRalf Thielow2017-04-131-2/+2
* | | | | | | | | | | | | Merge branch 'ah/diff-files-ours-theirs-doc'Junio C Hamano2017-04-191-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | diff-files: document --ours etc.ah/diff-files-ours-theirs-docAndreas Heiduk2017-04-131-0/+14
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'lt/mailinfo-in-body-header-continuation'Junio C Hamano2017-04-192-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mailinfo: fix in-body header continuationslt/mailinfo-in-body-header-continuationLinus Torvalds2017-04-112-3/+10
* | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-04-199-9/+219
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | push: propagate remote and refspec with --recurse-submodulesBrandon Williams2017-04-114-5/+117
| * | | | | | | | | | | | | | submodule--helper: add push-check subcommandBrandon Williams2017-04-111-0/+45
| * | | | | | | | | | | | | | remote: expose parse_push_refspec functionBrandon Williams2017-04-112-1/+2
| * | | | | | | | | | | | | | push: propagate push-options with --recurse-submodulesBrandon Williams2017-04-114-2/+53
| * | | | | | | | | | | | | | push: unmark a local variable as staticBrandon Williams2017-04-021-2/+3
* | | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-04-1946-451/+459
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation: update and rename api-sha1-array.txtbrian m. carlson2017-03-311-22/+22
| * | | | | | | | | | | | | | | Rename sha1_array to oid_arraybrian m. carlson2017-03-3131-155/+155
| * | | | | | | | | | | | | | | Convert sha1_array_for_each_unique and for_each_abbrev to object_idbrian m. carlson2017-03-319-37/+35
| * | | | | | | | | | | | | | | Convert sha1_array_lookup to take struct object_idbrian m. carlson2017-03-317-12/+11
| * | | | | | | | | | | | | | | Convert remaining callers of sha1_array_lookup to object_idbrian m. carlson2017-03-313-26/+26
| * | | | | | | | | | | | | | | Make sha1_array_append take a struct object_id *brian m. carlson2017-03-3117-30/+32
| * | | | | | | | | | | | | | | sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson2017-03-2811-58/+58
| * | | | | | | | | | | | | | | builtin/pull: convert to struct object_idbrian m. carlson2017-03-281-36/+36
| * | | | | | | | | | | | | | | submodule: convert check_for_new_submodule_commits to object_idbrian m. carlson2017-03-283-6/+6
| * | | | | | | | | | | | | | | sha1_name: convert disambiguate_hint_fn to take object_idbrian m. carlson2017-03-281-30/+34
| * | | | | | | | | | | | | | | sha1_name: convert struct disambiguate_state to object_idbrian m. carlson2017-03-281-11/+11
| * | | | | | | | | | | | | | | test-sha1-array: convert most code to struct object_idbrian m. carlson2017-03-281-5/+5
| * | | | | | | | | | | | | | | parse-options-cb: convert sha1_array_append caller to struct object_idbrian m. carlson2017-03-281-3/+3
| * | | | | | | | | | | | | | | fsck: convert init_skiplist to struct object_idbrian m. carlson2017-03-281-5/+6
| * | | | | | | | | | | | | | | builtin/receive-pack: convert portions to struct object_idbrian m. carlson2017-03-281-49/+49
| * | | | | | | | | | | | | | | builtin/pull: convert portions to struct object_idbrian m. carlson2017-03-261-3/+3
| * | | | | | | | | | | | | | | builtin/diff: convert to struct object_idbrian m. carlson2017-03-261-17/+17
| * | | | | | | | | | | | | | | Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZbrian m. carlson2017-03-268-10/+10
| * | | | | | | | | | | | | | | Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson2017-03-2610-14/+14
| * | | | | | | | | | | | | | | Define new hash-size constants for allocating memorybrian m. carlson2017-03-261-1/+5
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-short-status'Junio C Hamano2017-04-195-40/+218
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | submodule.c: correctly handle nested submodules in is_submodule_modifiedsb/submodule-short-statusStefan Beller2017-03-294-5/+24
| * | | | | | | | | | | | | | | | short status: improve reporting for submodule changesStefan Beller2017-03-294-7/+156
| * | | | | | | | | | | | | | | | submodule.c: stricter checking for submodules in is_submodule_modifiedStefan Beller2017-03-271-2/+3
| * | | | | | | | | | | | | | | | submodule.c: port is_submodule_modified to use porcelain 2Stefan Beller2017-03-271-4/+5
| * | | | | | | | | | | | | | | | submodule.c: convert is_submodule_modified to use strbuf_getwholelineStefan Beller2017-03-272-17/+31
| * | | | | | | | | | | | | | | | submodule.c: factor out early loop termination in is_submodule_modifiedStefan Beller2017-03-271-8/+8
| * | | | | | | | | | | | | | | | submodule.c: use argv_array in is_submodule_modifiedStefan Beller2017-03-271-8/+2
* | | | | | | | | | | | | | | | | Twelfth batch for 2.13Junio C Hamano2017-04-161-0/+16
* | | | | | | | | | | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-04-162-18/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \