Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/mingw-redirect-std-handles' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+12 |
|\ | |||||
| * | mingw: optionally redirect stderr/stdout via the same handle | Johannes Schindelin | 2017-11-02 | 1 | -1/+7 |
| * | mingw: add experimental feature to redirect standard handles | Johannes Schindelin | 2017-11-02 | 1 | -0/+6 |
* | | Merge branch 'js/wincred-empty-cred' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+19 |
|\ \ | |||||
| * | | t0302: check helper can handle empty credentials | Jakub Bereżański | 2017-11-01 | 1 | -0/+19 |
| |/ | |||||
* | | Merge branch 'ad/5580-unc-tests-on-cygwin' into maint | Junio C Hamano | 2017-11-15 | 1 | -4/+10 |
|\ \ | |||||
| * | | t5580: add Cygwin support | Adam Dinwoodie | 2017-11-01 | 1 | -4/+10 |
| * | | Merge branch 'jk/write-in-full-fix' into maint | Junio C Hamano | 2017-10-23 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maint | Junio C Hamano | 2017-10-23 | 1 | -0/+142 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jt/fast-export-copy-modify-fix' into maint | Junio C Hamano | 2017-10-23 | 1 | -1/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'nd/worktree-kill-parse-ref' into maint | Junio C Hamano | 2017-10-23 | 1 | -0/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/ref-filter-colors-fix' into maint | Junio C Hamano | 2017-10-18 | 12 | -62/+74 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rs/fsck-null-return-from-lookup' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+22 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rs/qsort-s' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'mr/doc-negative-pathspec' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ks/test-readme-phrasofix' into maint | Junio C Hamano | 2017-10-18 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/drop-sha1-entry-pos' into maint | Junio C Hamano | 2017-10-18 | 2 | -11/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/ref-filter-empty-modifier' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ar/request-pull-phrasofix' into maint | Junio C Hamano | 2017-10-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/describe-omit-some-refs' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/test-lint-echo-e' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/archive-excluded-directory' into maint | Junio C Hamano | 2017-10-18 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/packed-ref-store-prep' into maint | Junio C Hamano | 2017-10-18 | 1 | -2/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/send-email-cc-cruft' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/complete-checkout' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | completion: add remaining flags to checkout | Thomas Braun | 2017-10-25 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/check-ref-format-oor' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | check-ref-format --branch: do not expand @{...} outside repository | Junio C Hamano | 2017-10-17 | 1 | -0/+16 |
* | | | | | | | | | | | | | | | | | | | | | | | 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 executing | 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 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | sequencer: pass absolute GIT_DIR to exec commands | Jacob Keller | 2017-11-02 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/submodule-in-excluded' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | status: do not get confused by submodules in excluded directories | Johannes Schindelin | 2017-10-26 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-ref-store: avoid passing NULL to printf | Jeff King | 2017-10-21 | 1 | -1/+1 |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-color-moved-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -36/+177 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | diff: fix whitespace-skipping with --color-moved | Jeff King | 2017-10-21 | 1 | -0/+67 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | column: show auto columns when pager is active | Kevin Daudt | 2017-10-17 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/ref-locking-fix' | Junio C Hamano | 2017-10-26 | 1 | -0/+141 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | files_transaction_prepare(): fix handling of ref lock failure | Michael Haggerty | 2017-10-25 | 1 | -8/+8 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t1404: add a bunch of tests of D/F conflicts | Michael Haggerty | 2017-10-25 | 1 | -0/+141 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/ref-filter-colors-fix' | Junio C Hamano | 2017-10-18 | 3 | -5/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | tag: respect color.ui config | Jeff King | 2017-10-17 | 2 | -0/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 1 | -1/+1 |