summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config: match both symlink & realpath versions in IncludeIf.gitdir:*ab/conditional-config-with-symlinksÆvar Arnfjörð Bjarmason2017-05-173-0/+49
* Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano2017-04-265-30/+90
|\
| * config: correct file reading order in read_early_config()nd/conditional-config-in-early-configNguyễn Thái Ngọc Duy2017-04-192-14/+30
| * config: handle conditional include when $GIT_DIR is not set upNguyễn Thái Ngọc Duy2017-04-173-8/+38
| * config: prepare to pass more info in git_config_with_options()Nguyễn Thái Ngọc Duy2017-04-173-15/+29
* | Merge branch 'ab/push-cas-doc-n-test'Junio C Hamano2017-04-262-0/+70
|\ \
| * | push: document & test --force-with-lease with multiple remotesab/push-cas-doc-n-testÆvar Arnfjörð Bjarmason2017-04-192-0/+70
* | | Merge branch 'ls/travis-coccicheck'Junio C Hamano2017-04-261-0/+12
|\ \ \
| * | | travis-ci: add static analysis build job to run coccicheckls/travis-coccicheckLars Schneider2017-04-161-0/+12
| |/ /
* | | Merge branch 'ps/pathspec-empty-prefix-origin'Junio C Hamano2017-04-262-1/+23
|\ \ \
| * | | pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefixps/pathspec-empty-prefix-originPatrick Steinhardt2017-04-142-1/+23
* | | | Merge branch 'pc/t2027-git-to-pipe-cleanup'Junio C Hamano2017-04-261-14/+21
|\ \ \ \
| * | | | t2027: avoid using pipespc/t2027-git-to-pipe-cleanupPrathamesh Chavan2017-04-141-14/+21
* | | | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-264-22/+71
|\ \ \ \ \
| * | | | | rebase: pass --[no-]signoff option to git amgb/rebase-signoffGiuseppe Bilotta2017-04-183-1/+53
| * | | | | builtin/am: fold am_signoff() into am_append_signoff()Giuseppe Bilotta2017-04-161-18/+15
| * | | | | builtin/am: honor --signoff also when --rebasingGiuseppe Bilotta2017-04-161-3/+3
* | | | | | Getting ready for -rc1Junio C Hamano2017-04-231-3/+51
* | | | | | Merge branch 'dt/xgethostname-nul-termination'Junio C Hamano2017-04-237-14/+33
|\ \ \ \ \ \
| * | | | | | xgethostname: handle long hostnamesdt/xgethostname-nul-terminationDavid Turner2017-04-186-4/+19
| * | | | | | use HOST_NAME_MAX to size buffers for gethostname(2)René Scharfe2017-04-186-10/+14
* | | | | | | Merge branch 'jk/ls-files-recurse-submodules-fix'Junio C Hamano2017-04-232-1/+20
|\ \ \ \ \ \ \
| * | | | | | | ls-files: fix path used when recursing into submodulesjk/ls-files-recurse-submodules-fixJacob Keller2017-04-182-1/+15
| * | | | | | | ls-files: fix recurse-submodules with nested submodulesJacob Keller2017-04-172-0/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rs/misc-cppcheck-fixes'Junio C Hamano2017-04-233-13/+23
|\ \ \ \ \ \ \
| * | | | | | | server-info: avoid calling fclose(3) twice in update_info_file()rs/misc-cppcheck-fixesRené Scharfe2017-04-171-3/+5
| * | | | | | | files_for_each_reflog_ent_reverse(): close stream and free strbuf on errorRené Scharfe2017-04-171-8/+12
| * | | | | | | am: close stream on error, but not stdinRené Scharfe2017-04-161-2/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jk/snprintf-cleanups'Junio C Hamano2017-04-231-0/+1
|\ \ \ \ \ \ \
| * | | | | | | replace: plug a memory leakjk/snprintf-cleanupsJunio C Hamano2017-04-171-0/+1
* | | | | | | | Merge branch 'xy/format-patch-base'Junio C Hamano2017-04-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: trivial typo in git-format-patch.txtxy/format-patch-baseGiuseppe Bilotta2017-04-171-1/+1
* | | | | | | | | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-04-231-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: remove a superfluous second check for the "new" variableSebastian Schuberth2017-04-171-2/+1
* | | | | | | | | | Merge branch 'jt/fetch-pack-error-reporting'Junio C Hamano2017-04-232-1/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch-pack: show clearer error message upon ERRjt/fetch-pack-error-reportingJonathan Tan2017-04-172-1/+8
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'km/t1400-modernization'Junio C Hamano2017-04-231-168/+167
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1400: use consistent style for test_expect_success callskm/t1400-modernizationKyle Meyer2017-04-161-168/+167
* | | | | | | | | | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2017-04-235-1/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refs: reject ref updates while GIT_QUARANTINE_PATH is setjk/quarantine-received-objectsJeff King2017-04-163-1/+19
| * | | | | | | | | | | receive-pack: document user-visible quarantine effectsJeff King2017-04-162-0/+31
| * | | | | | | | | | | receive-pack: drop tmp_objdir_env from run_update_hookJeff King2017-04-161-1/+0
* | | | | | | | | | | | Merge branch 'jk/loose-object-fsck'Junio C Hamano2017-04-231-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sha1_file: remove an used fd variablejk/loose-object-fsckSebastian Schuberth2017-04-161-3/+0
* | | | | | | | | | | | | Merge branch 'bw/submodule-with-bs-path'Junio C Hamano2017-04-232-7/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule: prevent backslash expantion in submodule namesBrandon Williams2017-04-162-7/+21
* | | | | | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano2017-04-234-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | read-cache: force_verify_index_checksumJeff Hostetler2017-04-154-0/+23
* | | | | | | | | | | | | | | Merge branch 'jh/unpack-trees-micro-optim'Junio C Hamano2017-04-231-5/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | unpack-trees: avoid duplicate ODB lookups during checkoutjh/unpack-trees-micro-optimJeff Hostetler2017-04-151-5/+33
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |