Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'js/mingw-redirect-std-handles' into maint | Junio C Hamano | 2017-11-15 | 3 | -0/+88 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | mingw: document the standard handle redirectionjs/mingw-redirect-std-handles | Johannes Schindelin | 2017-11-02 | 1 | -0/+18 | |
| * | | | | | | | | | | mingw: optionally redirect stderr/stdout via the same handle | Johannes Schindelin | 2017-11-02 | 2 | -1/+22 | |
| * | | | | | | | | | | mingw: add experimental feature to redirect standard handles | Johannes Schindelin | 2017-11-02 | 2 | -0/+49 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'js/wincred-empty-cred' into maint | Junio C Hamano | 2017-11-15 | 2 | -2/+27 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | wincred: handle empty username/password correctlyjs/wincred-empty-cred | Jakub Bereżański | 2017-11-01 | 1 | -2/+8 | |
| * | | | | | | | | | | t0302: check helper can handle empty credentials | Jakub Bereżański | 2017-11-01 | 1 | -0/+19 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'js/mingw-full-version-in-resources' into maint | Junio C Hamano | 2017-11-15 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | mingw: include the full version information in the resourcesjs/mingw-full-version-in-resources | Johannes Schindelin | 2017-11-01 | 2 | -3/+4 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'dk/libsecret-unlock-to-load-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fix | Dennis Kaarsemaker | 2017-11-04 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'js/early-config' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | setup: avoid double slashes when looking for HEADjs/early-config | Jeff King | 2017-11-03 | 1 | -1/+3 | |
* | | | | | | | | | | | Merge branch 'ad/5580-unc-tests-on-cygwin' into maint | Junio C Hamano | 2017-11-15 | 1 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t5580: add Cygwin supportad/5580-unc-tests-on-cygwin | Adam Dinwoodie | 2017-11-01 | 1 | -4/+10 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -8/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | diff: fix lstat() error handling in diff_populate_filespec()ao/diff-populate-filespec-lstat-errorpath-fix | Andrey Okoshkin | 2017-10-29 | 1 | -8/+6 | |
* | | | | | | | | | | | | Merge branch 'sb/blame-config-doc' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | config: document blame configurationsb/blame-config-doc | Stefan Beller | 2017-11-06 | 1 | -0/+17 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'tb/complete-checkout' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | completion: add remaining flags to checkouttb/complete-checkout | Thomas Braun | 2017-10-25 | 2 | -1/+6 | |
* | | | | | | | | | | | | | Merge branch 'jc/check-ref-format-oor' into maint | Junio C Hamano | 2017-11-15 | 4 | -4/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | check-ref-format doc: --branch validates and expands <branch>jc/check-ref-format-oor | Junio C Hamano | 2017-10-18 | 1 | -1/+8 | |
| * | | | | | | | | | | | | | check-ref-format --branch: strip refs/heads/ using skip_prefix | Junio C Hamano | 2017-10-18 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | check-ref-format --branch: do not expand @{...} outside repository | Junio C Hamano | 2017-10-18 | 2 | -1/+20 | |
* | | | | | | | | | | | | | | Merge branch 'jc/t5601-copy-workaround' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t5601: rm the target file of cp that could still be executingjc/t5601-copy-workaround | Junio C Hamano | 2017-10-17 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | sequencer: pass absolute GIT_DIR to exec commandsjk/rebase-i-exec-gitdir-fix | Jacob Keller | 2017-11-02 | 2 | -1/+17 | |
* | | | | | | | | | | | | | | | | Merge branch 'bw/grep-recurse-submodules' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | grep: take the read-lock when adding a submodulebw/grep-recurse-submodules | Martin Ågren | 2017-11-02 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | Merge branch 'js/submodule-in-excluded' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | status: do not get confused by submodules in excluded directoriesjs/submodule-in-excluded | Johannes Schindelin | 2017-10-26 | 2 | -1/+12 | |
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | commit: check result of resolve_ref_unsafeao/check-resolve-ref-unsafe-result | Andrey Okoshkin | 2017-10-21 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maint | Junio C Hamano | 2017-11-15 | 4 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | worktree: handle broken symrefs in find_shared_symref()jk/misc-resolve-ref-unsafe-fixes | Jeff King | 2017-10-21 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | | log: handle broken HEAD in decoration check | Jeff King | 2017-10-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | remote: handle broken symrefs | Jeff King | 2017-10-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | test-ref-store: avoid passing NULL to printf | Jeff King | 2017-10-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maint | Junio C Hamano | 2017-11-15 | 3 | -78/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | diff.c: get rid of duplicate implementationsb/diff-color-moved-use-xdl-recmatch | Stefan Beller | 2017-10-26 | 1 | -78/+4 | |
| * | | | | | | | | | | | | | | | | | | | xdiff-interface: export comparing and hashing strings | Stefan Beller | 2017-10-26 | 2 | -0/+28 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-color-moved-fix' into maint | Junio C Hamano | 2017-11-15 | 2 | -42/+188 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | diff: handle NULs in get_string_hash()jk/diff-color-moved-fix | Jeff King | 2017-10-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | diff: fix whitespace-skipping with --color-moved | Jeff King | 2017-10-21 | 2 | -5/+77 | |
| * | | | | | | | | | | | | | | | | | | | t4015: test the output of "diff --color-moved -b" | Jeff King | 2017-10-21 | 1 | -9/+64 | |
| * | | | | | | | | | | | | | | | | | | | t4015: check "negative" case for "-w --color-moved" | Jeff King | 2017-10-21 | 1 | -8/+18 | |
| * | | | | | | | | | | | | | | | | | | | t4015: refactor --color-moved whitespace test | Jeff King | 2017-10-21 | 1 | -20/+29 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'kd/auto-col-with-pager-fix' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |