Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | config: match both symlink & realpath versions in IncludeIf.gitdir:*ab/conditional-config-with-symlinks | Ævar Arnfjörð Bjarmason | 2017-05-17 | 3 | -0/+49 |
* | Merge branch 'nd/conditional-config-in-early-config' | Junio C Hamano | 2017-04-26 | 5 | -30/+90 |
|\ | |||||
| * | config: correct file reading order in read_early_config()nd/conditional-config-in-early-config | Nguyễn Thái Ngọc Duy | 2017-04-19 | 2 | -14/+30 |
| * | config: handle conditional include when $GIT_DIR is not set up | Nguyễn Thái Ngọc Duy | 2017-04-17 | 3 | -8/+38 |
| * | config: prepare to pass more info in git_config_with_options() | Nguyễn Thái Ngọc Duy | 2017-04-17 | 3 | -15/+29 |
* | | Merge branch 'ab/push-cas-doc-n-test' | Junio C Hamano | 2017-04-26 | 2 | -0/+70 |
|\ \ | |||||
| * | | push: document & test --force-with-lease with multiple remotesab/push-cas-doc-n-test | Ævar Arnfjörð Bjarmason | 2017-04-19 | 2 | -0/+70 |
* | | | Merge branch 'ls/travis-coccicheck' | Junio C Hamano | 2017-04-26 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | travis-ci: add static analysis build job to run coccicheckls/travis-coccicheck | Lars Schneider | 2017-04-16 | 1 | -0/+12 |
| |/ / | |||||
* | | | Merge branch 'ps/pathspec-empty-prefix-origin' | Junio C Hamano | 2017-04-26 | 2 | -1/+23 |
|\ \ \ | |||||
| * | | | pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefixps/pathspec-empty-prefix-origin | Patrick Steinhardt | 2017-04-14 | 2 | -1/+23 |
* | | | | Merge branch 'pc/t2027-git-to-pipe-cleanup' | Junio C Hamano | 2017-04-26 | 1 | -14/+21 |
|\ \ \ \ | |||||
| * | | | | t2027: avoid using pipespc/t2027-git-to-pipe-cleanup | Prathamesh Chavan | 2017-04-14 | 1 | -14/+21 |
* | | | | | Merge branch 'gb/rebase-signoff' | Junio C Hamano | 2017-04-26 | 4 | -22/+71 |
|\ \ \ \ \ | |||||
| * | | | | | rebase: pass --[no-]signoff option to git amgb/rebase-signoff | Giuseppe Bilotta | 2017-04-18 | 3 | -1/+53 |
| * | | | | | builtin/am: fold am_signoff() into am_append_signoff() | Giuseppe Bilotta | 2017-04-16 | 1 | -18/+15 |
| * | | | | | builtin/am: honor --signoff also when --rebasing | Giuseppe Bilotta | 2017-04-16 | 1 | -3/+3 |
* | | | | | | Getting ready for -rc1 | Junio C Hamano | 2017-04-23 | 1 | -3/+51 |
* | | | | | | Merge branch 'dt/xgethostname-nul-termination' | Junio C Hamano | 2017-04-23 | 7 | -14/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | xgethostname: handle long hostnamesdt/xgethostname-nul-termination | David Turner | 2017-04-18 | 6 | -4/+19 |
| * | | | | | | use HOST_NAME_MAX to size buffers for gethostname(2) | René Scharfe | 2017-04-18 | 6 | -10/+14 |
* | | | | | | | Merge branch 'jk/ls-files-recurse-submodules-fix' | Junio C Hamano | 2017-04-23 | 2 | -1/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ls-files: fix path used when recursing into submodulesjk/ls-files-recurse-submodules-fix | Jacob Keller | 2017-04-18 | 2 | -1/+15 |
| * | | | | | | | ls-files: fix recurse-submodules with nested submodules | Jacob Keller | 2017-04-17 | 2 | -0/+5 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/misc-cppcheck-fixes' | Junio C Hamano | 2017-04-23 | 3 | -13/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | server-info: avoid calling fclose(3) twice in update_info_file()rs/misc-cppcheck-fixes | René Scharfe | 2017-04-17 | 1 | -3/+5 |
| * | | | | | | | files_for_each_reflog_ent_reverse(): close stream and free strbuf on error | René Scharfe | 2017-04-17 | 1 | -8/+12 |
| * | | | | | | | am: close stream on error, but not stdin | René Scharfe | 2017-04-16 | 1 | -2/+6 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/snprintf-cleanups' | Junio C Hamano | 2017-04-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | replace: plug a memory leakjk/snprintf-cleanups | Junio C Hamano | 2017-04-17 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'xy/format-patch-base' | Junio C Hamano | 2017-04-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: trivial typo in git-format-patch.txtxy/format-patch-base | Giuseppe Bilotta | 2017-04-17 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'sb/checkout-recurse-submodules' | Junio C Hamano | 2017-04-23 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodule: remove a superfluous second check for the "new" variable | Sebastian Schuberth | 2017-04-17 | 1 | -2/+1 |
* | | | | | | | | | | Merge branch 'jt/fetch-pack-error-reporting' | Junio C Hamano | 2017-04-23 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fetch-pack: show clearer error message upon ERRjt/fetch-pack-error-reporting | Jonathan Tan | 2017-04-17 | 2 | -1/+8 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'km/t1400-modernization' | Junio C Hamano | 2017-04-23 | 1 | -168/+167 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t1400: use consistent style for test_expect_success callskm/t1400-modernization | Kyle Meyer | 2017-04-16 | 1 | -168/+167 |
* | | | | | | | | | | | Merge branch 'jk/quarantine-received-objects' | Junio C Hamano | 2017-04-23 | 5 | -1/+49 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | refs: reject ref updates while GIT_QUARANTINE_PATH is setjk/quarantine-received-objects | Jeff King | 2017-04-16 | 3 | -1/+19 |
| * | | | | | | | | | | | receive-pack: document user-visible quarantine effects | Jeff King | 2017-04-16 | 2 | -0/+31 |
| * | | | | | | | | | | | receive-pack: drop tmp_objdir_env from run_update_hook | Jeff King | 2017-04-16 | 1 | -1/+0 |
* | | | | | | | | | | | | Merge branch 'jk/loose-object-fsck' | Junio C Hamano | 2017-04-23 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | sha1_file: remove an used fd variablejk/loose-object-fsck | Sebastian Schuberth | 2017-04-16 | 1 | -3/+0 |
* | | | | | | | | | | | | | Merge branch 'bw/submodule-with-bs-path' | Junio C Hamano | 2017-04-23 | 2 | -7/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | submodule: prevent backslash expantion in submodule names | Brandon Williams | 2017-04-16 | 2 | -7/+21 |
* | | | | | | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck' | Junio C Hamano | 2017-04-23 | 4 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | read-cache: force_verify_index_checksum | Jeff Hostetler | 2017-04-15 | 4 | -0/+23 |
* | | | | | | | | | | | | | | | Merge branch 'jh/unpack-trees-micro-optim' | Junio C Hamano | 2017-04-23 | 1 | -5/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | unpack-trees: avoid duplicate ODB lookups during checkoutjh/unpack-trees-micro-optim | Jeff Hostetler | 2017-04-15 | 1 | -5/+33 |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |