Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removal | David Turner | 2015-07-21 | 1 | -0/+52 |
* | Merge branch 'maint-1.9' into maint-2.0maint-2.0 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
|\ | |||||
| * | Merge branch 'maint-1.8.5' into maint-1.9maint-1.9 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| |\ | |||||
| | * | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | |\ | |||||
| | | * | is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5 | Jeff King | 2014-12-29 | 1 | -0/+15 |
* | | | | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
|\ \ \ \ | |/ / / | |||||
| * | | | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| | |\ \ | | | |/ | |||||
| | | * | fsck: complain about NTFS ".git" aliases in trees | Johannes Schindelin | 2014-12-17 | 1 | -2/+7 |
| | | * | read-cache: optionally disallow NTFS .git variants | Johannes Schindelin | 2014-12-17 | 1 | -0/+13 |
| | | * | fsck: complain about HFS+ ".git" aliases in trees | Jeff King | 2014-12-17 | 1 | -3/+5 |
| | | * | read-cache: optionally disallow HFS+ .git variants | Jeff King | 2014-12-17 | 2 | -5/+25 |
| | | * | fsck: notice .git case-insensitively | Jeff King | 2014-12-17 | 1 | -0/+1 |
| | | * | t1450: refactor ".", "..", and ".git" fsck tests | Jeff King | 2014-12-17 | 1 | -30/+27 |
| | | * | verify_dotfile(): reject .git case-insensitively | Jeff King | 2014-12-17 | 1 | -0/+1 |
| | | * | read-tree: add tests for confusing paths like ".." and ".git" | Jeff King | 2014-12-17 | 1 | -0/+32 |
| * | | | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2014-07-16 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
* | | | | commit --amend: test specifies authorship but forgets to check | Fabian Ruch | 2014-07-30 | 1 | -0/+1 |
* | | | | t4013: test diff-tree's --stdin commit formatting | Jeff King | 2014-07-28 | 1 | -0/+10 |
* | | | | Merge branch 'zk/log-graph-showsig' into maint | Junio C Hamano | 2014-07-22 | 1 | -0/+31 |
|\ \ \ \ | |||||
| * | | | | log: fix indentation for --graph --show-signaturezk/log-graph-showsig | Zoltan Klinger | 2014-07-09 | 1 | -0/+31 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint | Junio C Hamano | 2014-07-22 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * | | | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-merges | Charles Bailey | 2014-07-01 | 1 | -0/+11 |
* | | | | | Merge branch 'jm/dedup-test-config' into maint | Junio C Hamano | 2014-07-22 | 1 | -5/+0 |
|\ \ \ \ \ | |||||
| * | | | | | t/t7810-grep.sh: remove duplicate test_config()jm/dedup-test-config | Jeremiah Mahler | 2014-06-05 | 1 | -5/+0 |
* | | | | | | Merge branch 'sk/test-cmp-bin' into maint | Junio C Hamano | 2014-07-22 | 5 | -22/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5000, t5003: do not use test_cmp to compare binary filessk/test-cmp-bin | Stepan Kasal | 2014-06-04 | 5 | -22/+28 |
* | | | | | | | Merge branch 'lt/request-pull' into maint | Junio C Hamano | 2014-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix brown paper bag breakage in t5150-request-pull.shlt/request-pull | Johannes Sixt | 2014-06-02 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ep/shell-assign-and-export-vars' into maint | Junio C Hamano | 2014-07-22 | 2 | -2/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-vars | Junio C Hamano | 2014-05-23 | 2 | -2/+10 |
* | | | | | | | | | Merge branch 'jk/pretty-G-format-fixes' into maint | Junio C Hamano | 2014-07-16 | 2 | -9/+68 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | move "%G" format test from t7510 to t6006jk/pretty-G-format-fixes | Jeff King | 2014-06-25 | 2 | -6/+6 |
| * | | | | | | | | | pretty: avoid reading past end-of-string with "%G" | Jeff King | 2014-06-17 | 1 | -0/+6 |
| * | | | | | | | | | t7510: check %G* pretty-format output | Jeff King | 2014-06-17 | 1 | -0/+40 |
| * | | | | | | | | | t7510: test a commit signed by an unknown key | Jeff King | 2014-06-17 | 1 | -0/+13 |
| * | | | | | | | | | t7510: use consistent &&-chains in loop | Michael J Gruber | 2014-06-17 | 1 | -6/+6 |
| * | | | | | | | | | t7510: stop referring to master in later tests | Jeff King | 2014-06-17 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'bc/fix-rebase-merge-skip' into maint | Junio C Hamano | 2014-07-16 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skip | brian m. carlson | 2014-06-16 | 1 | -0/+15 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-28 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mw/symlinks' into maint | Junio C Hamano | 2014-05-28 | 2 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-08 | 1 | -22/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'km/avoid-bs-in-shell-glob' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'km/avoid-cp-a' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/trim-trailing-spaces' into maint | Junio C Hamano | 2014-07-10 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t0008: do not depend on 'echo' handling backslashes speciallypb/trim-trailing-spaces | Junio C Hamano | 2014-06-13 | 1 | -6/+8 |
| * | | | | | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequence | Pasha Bolokhov | 2014-06-02 | 1 | -0/+23 |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maint | Junio C Hamano | 2014-07-10 | 1 | -2/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | repack: respect pack.writebitmaps | Jeff King | 2014-06-10 | 1 | -1/+17 |