summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rc/for-each-ref-tracking'Junio C Hamano2015-01-141-0/+13
|\
| * for-each-ref: always check stat_tracking_info()'s return valuerc/for-each-ref-trackingRaphael Kubo da Costa2015-01-121-0/+13
* | Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano2015-01-141-44/+48
|\ \
| * | test-lib.sh: do tests for color support after changing HOMERichard Hansen2015-01-071-43/+47
| * | test-lib: use 'test ...' instead of '[ ... ]'Richard Hansen2015-01-071-3/+3
* | | Merge branch 'rh/hide-prompt-in-ignored-directory'Junio C Hamano2015-01-141-0/+106
|\ \ \
| * | | git-prompt.sh: allow to hide prompt for ignored pwdrh/hide-prompt-in-ignored-directoryJess Austin2015-01-071-0/+106
| |/ /
* | | Merge branch 'jk/prune-packed-server-info'Junio C Hamano2015-01-141-0/+11
|\ \ \
| * | | update-server-info: create info/* with mode 0666jk/prune-packed-server-infoJeff King2015-01-061-0/+10
| * | | t1301: set umask in reflog sharedrepository=group testJeff King2015-01-061-0/+1
* | | | Merge branch 'js/remote-add-with-insteadof'Junio C Hamano2015-01-141-0/+5
|\ \ \ \
| * | | | Add a regression test for 'git remote add <existing> <same-url>'js/remote-add-with-insteadofJohannes Schindelin2014-12-231-0/+5
* | | | | Merge branch 'es/checkout-index-temp'Junio C Hamano2015-01-121-195/+205
|\ \ \ \ \
| * | | | | checkout-index: fix --temp relative path manglinges/checkout-index-tempEric Sunshine2014-12-291-1/+1
| * | | | | t2004: demonstrate broken relative path printingEric Sunshine2014-12-291-0/+12
| * | | | | t2004: standardize file naming in symlink testEric Sunshine2014-12-291-3/+3
| * | | | | t2004: drop unnecessary write-tree/read-treeEric Sunshine2014-12-291-3/+0
| * | | | | t2004: modernize styleEric Sunshine2014-12-291-195/+196
| | |_|_|/ | |/| | |
* | | | | Merge branch 'cc/bisect-rev-parsing'Junio C Hamano2015-01-121-0/+9
|\ \ \ \ \
| * | | | | bisect: add test to check that revs are properly parsedcc/bisect-rev-parsingChristian Couder2014-12-291-0/+9
* | | | | | Merge branch 'maint'Junio C Hamano2015-01-071-0/+15
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-2.1' into maintJunio C Hamano2015-01-071-0/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'maint-2.0' into maint-2.1maint-2.1Junio C Hamano2015-01-071-0/+15
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-071-0/+15
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-071-0/+15
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-071-0/+15
| | | | | |\ \ \ \
| | | | | | * | | | is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5Jeff King2014-12-291-0/+15
* | | | | | | | | | Merge branch 'bw/maint-0090-awk-tweak'Junio C Hamano2015-01-071-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0090: tweak awk statement for Solaris /usr/xpg4/bin/awkbw/maint-0090-awk-tweakBen Walton2014-12-231-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'jk/no-perl-tests' into maintJunio C Hamano2014-12-223-4/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-221-2/+30
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-221-0/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-221-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-221-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t5400-remove-unused'Junio C Hamano2015-01-071-15/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t5400: remove dead codesb/t5400-remove-unusedStefan Beller2014-12-161-15/+1
* | | | | | | | | | | | | | | | Merge branch 'lh/send-email-hide-x-mailer'Junio C Hamano2015-01-071-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | test/send-email: --[no-]xmailer testslh/send-email-hide-x-mailerLuis Henriques2014-12-151-0/+33
* | | | | | | | | | | | | | | | | Merge branch 'rd/send-email-2047-fix'Junio C Hamano2015-01-071-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | send-email: handle adjacent RFC 2047-encoded words properlyrd/send-email-2047-fixРоман Донченко2014-12-151-0/+7
* | | | | | | | | | | | | | | | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates'Junio C Hamano2015-01-071-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-datesJeff King2014-11-131-0/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/lockfile-absolute'Junio C Hamano2015-01-071-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | lockfile.c: store absolute pathnd/lockfile-absoluteNguyễn Thái Ngọc Duy2014-11-031-0/+15
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'Junio C Hamano2015-01-071-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | strbuf_add_commented_lines(): avoid SP-HT sequence in commented linesjc/strbuf-add-lines-avoid-sp-ht-sequenceJunio C Hamano2014-10-271-0/+6
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-b-m'Junio C Hamano2015-01-072-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | diff -B -M: fix output for "copy and then rewrite" caseJunio C Hamano2014-10-232-3/+4
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/clone-borrow'Junio C Hamano2015-01-071-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | clone: --dissociate option to mark that reference is only temporaryjc/clone-borrowJunio C Hamano2014-10-151-0/+17
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |