Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jm/status-ignored-files-list' | Junio C Hamano | 2017-11-13 | 1 | -0/+233 |
|\ | |||||
| * | status: test ignored modesjm/status-ignored-files-list | Jameson Miller | 2017-10-31 | 1 | -0/+233 |
* | | Merge branch 'js/mingw-redirect-std-handles' | Junio C Hamano | 2017-11-09 | 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' | Junio C Hamano | 2017-11-09 | 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' | Junio C Hamano | 2017-11-09 | 1 | -4/+10 |
|\ \ \ | |||||
| * | | | t5580: add Cygwin supportad/5580-unc-tests-on-cygwin | 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' | Junio C Hamano | 2017-11-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | completion: add remaining flags to checkouttb/complete-checkout | Thomas Braun | 2017-10-25 | 1 | -0/+4 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mp/push-pushoption-config' | Junio C Hamano | 2017-11-06 | 1 | -0/+77 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | builtin/push.c: add push.pushOption configmp/push-pushoption-config | Marius Paliga | 2017-10-24 | 1 | -0/+77 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/fetch-moved-submodules-on-demand' | Junio C Hamano | 2017-11-06 | 1 | -1/+76 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | implement fetching of moved submodules | Heiko Voigt | 2017-10-17 | 1 | -0/+35 |
| * | | | | | | | | | | | | | | | | | | | | | | fetch: add test to make sure we stay backwards compatible | Heiko Voigt | 2017-10-08 | 1 | -1/+41 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/check-ref-format-oor' | Junio C Hamano | 2017-11-06 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | check-ref-format --branch: do not expand @{...} outside repository | Junio C Hamano | 2017-10-18 | 1 | -0/+16 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t5601-copy-workaround' | Junio C Hamano | 2017-11-06 | 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 'bc/object-id' | Junio C Hamano | 2017-11-06 | 1 | -14/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | refs: convert resolve_ref_unsafe to struct object_id | brian m. carlson | 2017-10-16 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | refs: convert peel_ref to struct object_id | brian m. carlson | 2017-10-16 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | refs: convert update_ref and refs_update_ref to use struct object_id | brian m. carlson | 2017-10-16 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | refs: convert delete_ref and refs_delete_ref to struct object_id | brian m. carlson | 2017-10-16 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ds/find-unique-abbrev-optim' | Junio C Hamano | 2017-11-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | p4211-line-log.sh: add log --online --raw --parents perf test | Derrick Stolee | 2017-10-13 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/pull-signoff' | Junio C Hamano | 2017-11-06 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoff | W. Trevor King | 2017-10-13 | 1 | -0/+45 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/bisect-helper' | Junio C Hamano | 2017-11-06 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t6030: explicitly test for bisection cleanup | Pranit Bauva | 2017-10-06 | 1 | -0/+17 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dm/run-command-ignored-hook-advise' | Junio C Hamano | 2017-11-06 | 1 | -0/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |