Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mt/p4-parse-G-output' | Junio C Hamano | 2017-07-21 | 1 | -0/+103 |
|\ | |||||
| * | git-p4: filter for {'code':'info'} in p4CmdList | Miguel Torroja | 2017-07-13 | 1 | -2/+2 |
| * | git-p4: parse marshal output "p4 -G" in p4 changes | Miguel Torroja | 2017-07-13 | 1 | -1/+1 |
| * | git-p4: git-p4 tests with p4 triggers | Miguel Torroja | 2017-07-13 | 1 | -0/+103 |
* | | Merge branch 'jk/test-copy-bytes-fix' | Junio C Hamano | 2017-07-21 | 1 | -0/+1 |
|\ \ | |||||
| * | | t: handle EOF in test_copy_bytes() | Jeff King | 2017-07-17 | 1 | -0/+1 |
| * | | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-07-13 | 1 | -0/+44 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/reflog-walk-maint' into maint | Junio C Hamano | 2017-07-13 | 2 | -0/+21 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'js/alias-case-sensitivity' | Junio C Hamano | 2017-07-21 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | alias: compare alias name *case-insensitively* | Johannes Schindelin | 2017-07-17 | 1 | -1/+1 |
| * | | | | | t1300: demonstrate that CamelCased aliases regressed | Johannes Schindelin | 2017-07-17 | 1 | -0/+7 |
* | | | | | | Merge branch 'jk/gc-pre-detach-under-hook' | Junio C Hamano | 2017-07-18 | 1 | -0/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gc: run pre-detach operations under lock | Jeff King | 2017-07-12 | 1 | -0/+21 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'js/fsck-name-object' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -4/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'cc/shared-index-permfix' into maint | Junio C Hamano | 2017-07-10 | 3 | -11/+42 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ks/t7508-indent-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/t4005-modernize' into maint | Junio C Hamano | 2017-07-10 | 1 | -52/+43 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rs/apply-validate-input' into maint | Junio C Hamano | 2017-07-10 | 3 | -1/+57 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/rebase-i-regression-fix-tests' into maint | Junio C Hamano | 2017-07-10 | 2 | -5/+140 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-p-commentchar-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/alias-early-config' into maint | Junio C Hamano | 2017-07-10 | 3 | -1/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'tb/push-to-cygwin-unc-path' | Junio C Hamano | 2017-07-18 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | cygwin: allow pushing to UNC paths | Torsten Bögershausen | 2017-07-05 | 1 | -0/+2 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'jk/build-with-asan' | Junio C Hamano | 2017-07-14 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | test-lib: turn on ASan abort_on_error by default | Jeff King | 2017-07-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | test-lib: set ASAN_OPTIONS variable before we run git | Jeff King | 2017-07-10 | 1 | -3/+8 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'sb/pull-rebase-submodule' | Junio C Hamano | 2017-07-14 | 1 | -0/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | pull: optionally rebase submodules (remote submodule changes only) | Stefan Beller | 2017-06-24 | 1 | -0/+58 |
* | | | | | | | | | | | | | | | Merge branch 'sb/hashmap-customize-comparison' | Junio C Hamano | 2017-07-14 | 1 | -7/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | hashmap.h: compare function has access to a data field | Stefan Beller | 2017-06-30 | 1 | -7/+12 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' | Junio C Hamano | 2017-07-13 | 1 | -0/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter format | Jeff King | 2017-07-09 | 1 | -0/+44 |
* | | | | | | | | | | | | | | | Merge branch 'jk/reflog-walk-maint' | Junio C Hamano | 2017-07-10 | 2 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | reflog-walk: don't free reflogs added to cache | Jeff King | 2017-07-07 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | reflog-walk: duplicate strings in complete_reflogs list | Jeff King | 2017-07-07 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | reflog-walk: skip over double-null oid due to HEAD rename | Jeff King | 2017-07-05 | 1 | -0/+11 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'sd/t3200-branch-m-test' into maint | Junio C Hamano | 2017-06-25 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'km/test-mailinfo-b-failure' into maint | Junio C Hamano | 2017-06-25 | 1 | -0/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/stash-push-pathspec-fix' into maint | Junio C Hamano | 2017-06-25 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2017-06-25 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-06-25 | 2 | -0/+105 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/name-rev-lw-tag' into maint | Junio C Hamano | 2017-06-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/wildmatch' | Junio C Hamano | 2017-07-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | wildmatch: remove unused wildopts parameter | Ævar Arnfjörð Bjarmason | 2017-06-24 | 1 | -3/+3 |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/unquote-path-in-git-pm' | Junio C Hamano | 2017-07-10 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | t9700: add tests for Git::unquote_path() | Phillip Wood | 2017-06-30 | 1 | -0/+7 |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/commit-assuming-only-warning-removal' | Junio C Hamano | 2017-07-10 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | commit-template: distinguish status information unconditionally | Kaartic Sivaraam | 2017-06-30 | 1 | -0/+23 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' | Junio C Hamano | 2017-07-07 | 1 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |