Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 valuerc/for-each-ref-tracking | Raphael Kubo da Costa | 2015-01-12 | 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 pwdrh/hide-prompt-in-ignored-directory | 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 0666jk/prune-packed-server-info | 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>'js/remote-add-with-insteadof | 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 manglinges/checkout-index-temp | 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 parsedcc/bisect-rev-parsing | 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.1maint-2.1 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | 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 |
* | | | | | | | | | | 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/awkbw/maint-0090-awk-tweak | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/t5400-remove-unused' | Junio C Hamano | 2015-01-07 | 1 | -15/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t5400: remove dead codesb/t5400-remove-unused | Stefan Beller | 2014-12-16 | 1 | -15/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'lh/send-email-hide-x-mailer' | Junio C Hamano | 2015-01-07 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | test/send-email: --[no-]xmailer testslh/send-email-hide-x-mailer | Luis Henriques | 2014-12-15 | 1 | -0/+33 |
* | | | | | | | | | | | | | | | | | Merge branch 'rd/send-email-2047-fix' | Junio C Hamano | 2015-01-07 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | send-email: handle adjacent RFC 2047-encoded words properlyrd/send-email-2047-fix | Роман Донченко | 2014-12-15 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' | Junio C Hamano | 2015-01-07 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-dates | Jeff King | 2014-11-13 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/lockfile-absolute' | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | lockfile.c: store absolute pathnd/lockfile-absolute | Nguyễn Thái Ngọc Duy | 2014-11-03 | 1 | -0/+15 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence' | Junio C Hamano | 2015-01-07 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | strbuf_add_commented_lines(): avoid SP-HT sequence in commented linesjc/strbuf-add-lines-avoid-sp-ht-sequence | Junio C Hamano | 2014-10-27 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-b-m' | Junio C Hamano | 2015-01-07 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | diff -B -M: fix output for "copy and then rewrite" case | Junio C Hamano | 2014-10-23 | 2 | -3/+4 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/clone-borrow' | Junio C Hamano | 2015-01-07 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | clone: --dissociate option to mark that reference is only temporaryjc/clone-borrow | Junio C Hamano | 2014-10-15 | 1 | -0/+17 |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |