Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dk/format-patch-ignore-diff-submodule' | Junio C Hamano | 2015-02-11 | 1 | -0/+72 |
|\ | |||||
| * | format-patch: ignore diff.submodule setting | Doug Kelly | 2015-01-08 | 1 | -2/+2 |
| * | t4255: test am submodule with diff.submodule | Doug Kelly | 2015-01-08 | 1 | -0/+72 |
* | | Merge branch 'ld/p4-exclude-in-sync' | Junio C Hamano | 2015-02-11 | 1 | -0/+71 |
|\ \ | |||||
| * | | git-p4: support excluding paths on sync | Luke Diamand | 2015-02-11 | 1 | -0/+71 |
* | | | Merge branch 'ak/typofixes' | Junio C Hamano | 2015-02-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | t/lib-terminal.sh: fix typo | Alexander Kuleshov | 2015-01-21 | 1 | -1/+1 |
* | | | | Merge branch 'js/t1050' | Junio C Hamano | 2015-01-22 | 1 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | t1050-large: generate large files without dd | Johannes Sixt | 2015-01-14 | 1 | -6/+6 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'mg/add-ignore-errors' into maint | Junio C Hamano | 2015-01-12 | 1 | -1/+7 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint | Junio C Hamano | 2015-01-12 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/for-each-reflog-ent-reverse' into maint | Junio C Hamano | 2015-01-12 | 1 | -0/+30 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jh/empty-notes' | Junio C Hamano | 2015-01-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix unclosed here document in t3301.sh | Kacper Kornet | 2015-01-22 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2015-01-21 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | parse_color: fix return value for numeric color values 0-8 | Jeff King | 2015-01-21 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'rc/for-each-ref-tracking' | Junio C Hamano | 2015-01-14 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | for-each-ref: always check stat_tracking_info()'s return value | Raphael Kubo da Costa | 2015-01-13 | 1 | -0/+13 |
* | | | | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' | Junio C Hamano | 2015-01-14 | 1 | -44/+48 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | test-lib.sh: do tests for color support after changing HOME | Richard Hansen | 2015-01-07 | 1 | -43/+47 |
| * | | | | | | | | | test-lib: use 'test ...' instead of '[ ... ]' | Richard Hansen | 2015-01-07 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'rh/hide-prompt-in-ignored-directory' | Junio C Hamano | 2015-01-14 | 1 | -0/+106 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-prompt.sh: allow to hide prompt for ignored pwd | Jess Austin | 2015-01-07 | 1 | -0/+106 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jk/prune-packed-server-info' | Junio C Hamano | 2015-01-14 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update-server-info: create info/* with mode 0666 | Jeff King | 2015-01-06 | 1 | -0/+10 |
| * | | | | | | | | | | t1301: set umask in reflog sharedrepository=group test | Jeff King | 2015-01-06 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'js/remote-add-with-insteadof' | Junio C Hamano | 2015-01-14 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add a regression test for 'git remote add <existing> <same-url>' | Johannes Schindelin | 2014-12-23 | 1 | -0/+5 |
* | | | | | | | | | | | | Merge branch 'es/checkout-index-temp' | Junio C Hamano | 2015-01-12 | 1 | -195/+205 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | checkout-index: fix --temp relative path mangling | Eric Sunshine | 2014-12-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | t2004: demonstrate broken relative path printing | Eric Sunshine | 2014-12-29 | 1 | -0/+12 |
| * | | | | | | | | | | | | t2004: standardize file naming in symlink test | Eric Sunshine | 2014-12-29 | 1 | -3/+3 |
| * | | | | | | | | | | | | t2004: drop unnecessary write-tree/read-tree | Eric Sunshine | 2014-12-29 | 1 | -3/+0 |
| * | | | | | | | | | | | | t2004: modernize style | Eric Sunshine | 2014-12-29 | 1 | -195/+196 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'cc/bisect-rev-parsing' | Junio C Hamano | 2015-01-12 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | bisect: add test to check that revs are properly parsed | Christian Couder | 2014-12-29 | 1 | -0/+9 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'maint-2.1' into maint | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'maint-2.0' into maint-2.1 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'maint-1.9' into maint-2.0 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | is_hfs_dotgit: loosen over-eager match of \u{..47} | Jeff King | 2014-12-29 | 1 | -0/+15 |
* | | | | | | | | | | | | | | | Merge branch 'bw/maint-0090-awk-tweak' | Junio C Hamano | 2015-01-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk | Ben Walton | 2014-12-23 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch 'jk/no-perl-tests' into maint | Junio C Hamano | 2014-12-22 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-simple' into maint | Junio C Hamano | 2014-12-22 | 1 | -2/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/config-flip-xbit-back-after-checking' into maint | Junio C Hamano | 2014-12-22 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/colors-fix' into maint | Junio C Hamano | 2014-12-22 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/checkout-from-tree' into maint | Junio C Hamano | 2014-12-22 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |