aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'nd/worktree-add-lock'Junio C Hamano2017-04-26
|\
| * worktree add: add --lock optionNguyễn Thái Ngọc Duy2017-04-20
* | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-26
|\ \
| * | am: drop "dir" parameter from am_state_initJeff King2017-04-20
| * | replace strbuf_addstr(git_path()) with git_path_buf()Jeff King2017-04-20
| * | replace xstrdup(git_path(...)) with git_pathdup(...)Jeff King2017-04-20
| * | use git_path_* helper functionsJeff King2017-04-20
| * | branch: add edit_description() helperJeff King2017-04-20
* | | Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano2017-04-26
|\ \ \
| * | | config: prepare to pass more info in git_config_with_options()Nguyễn Thái Ngọc Duy2017-04-17
* | | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-26
|\ \ \ \
| * | | | builtin/am: fold am_signoff() into am_append_signoff()Giuseppe Bilotta2017-04-16
| * | | | builtin/am: honor --signoff also when --rebasingGiuseppe Bilotta2017-04-16
* | | | | Merge branch 'dt/xgethostname-nul-termination'Junio C Hamano2017-04-23
|\ \ \ \ \
| * | | | | xgethostname: handle long hostnamesDavid Turner2017-04-18
| * | | | | use HOST_NAME_MAX to size buffers for gethostname(2)René Scharfe2017-04-18
* | | | | | Merge branch 'jk/ls-files-recurse-submodules-fix'Junio C Hamano2017-04-23
|\ \ \ \ \ \
| * | | | | | ls-files: fix path used when recursing into submodulesJacob Keller2017-04-18
| * | | | | | ls-files: fix recurse-submodules with nested submodulesJacob Keller2017-04-17
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs/misc-cppcheck-fixes'Junio C Hamano2017-04-23
|\ \ \ \ \ \
| * | | | | | am: close stream on error, but not stdinRené Scharfe2017-04-16
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/snprintf-cleanups'Junio C Hamano2017-04-23
|\ \ \ \ \ \
| * | | | | | replace: plug a memory leakJunio C Hamano2017-04-17
* | | | | | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2017-04-23
|\ \ \ \ \ \ \
| * | | | | | | receive-pack: drop tmp_objdir_env from run_update_hookJeff King2017-04-16
* | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano2017-04-23
|\ \ \ \ \ \ \ \
| * | | | | | | | read-cache: force_verify_index_checksumJeff Hostetler2017-04-15
* | | | | | | | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-04-23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | path.c: and an option to call real_path() in expand_user_path()Nguyễn Thái Ngọc Duy2017-04-14
* | | | | | | | | | Merge branch 'ab/grep-plug-pathspec-leak'Junio C Hamano2017-04-19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: plug a trivial memory leakÆvar Arnfjörð Bjarmason2017-04-16
* | | | | | | | | | | Merge branch 'nd/files-backend-git-dir'Junio C Hamano2017-04-19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refs: delete pack_refs() in favor of refs_pack_refs()Nguyễn Thái Ngọc Duy2017-04-14
* | | | | | | | | | | | Merge branch 'bw/submodule-is-active'Junio C Hamano2017-04-19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule--helper: fix typo in is_active error messageStefan Beller2017-04-13
* | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-04-19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule--helper: add push-check subcommandBrandon Williams2017-04-11
| * | | | | | | | | | | | | push: unmark a local variable as staticBrandon Williams2017-04-02
* | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-04-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Rename sha1_array to oid_arraybrian m. carlson2017-03-31
| * | | | | | | | | | | | | Convert sha1_array_for_each_unique and for_each_abbrev to object_idbrian m. carlson2017-03-31
| * | | | | | | | | | | | | Convert sha1_array_lookup to take struct object_idbrian m. carlson2017-03-31
| * | | | | | | | | | | | | Convert remaining callers of sha1_array_lookup to object_idbrian m. carlson2017-03-31
| * | | | | | | | | | | | | Make sha1_array_append take a struct object_id *brian m. carlson2017-03-31
| * | | | | | | | | | | | | sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson2017-03-28
| * | | | | | | | | | | | | builtin/pull: convert to struct object_idbrian m. carlson2017-03-28
| * | | | | | | | | | | | | submodule: convert check_for_new_submodule_commits to object_idbrian m. carlson2017-03-28
| * | | | | | | | | | | | | builtin/receive-pack: convert portions to struct object_idbrian m. carlson2017-03-28
| * | | | | | | | | | | | | builtin/pull: convert portions to struct object_idbrian m. carlson2017-03-26
| * | | | | | | | | | | | | builtin/diff: convert to struct object_idbrian m. carlson2017-03-26