Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cb/maint-orphan-merge-noclobber' into maint | Junio C Hamano | 2010-12-02 | 1 | -0/+16 |
|\ | |||||
| * | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 | 1 | -0/+16 |
* | | Merge branch 'bg/maint-gitweb-test-lib' into maint | Junio C Hamano | 2010-12-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | t/gitweb-lib: Don't pass constant to decode_utf8 | Brian Gernhardt | 2010-10-20 | 1 | -1/+1 |
* | | | Merge branch 'tr/maint-merge-file-subdir' into maint | Junio C Hamano | 2010-12-02 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | merge-file: correctly find files when called in subdir | Thomas Rast | 2010-10-18 | 1 | -0/+8 |
* | | | | Merge branch 'ks/no-textconv-symlink' into maint | Junio C Hamano | 2010-12-02 | 2 | -12/+88 |
|\ \ \ \ | |||||
| * | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' | Kirill Smelkov | 2010-09-29 | 2 | -8/+4 |
| * | | | | blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks | Kirill Smelkov | 2010-09-29 | 2 | -0/+78 |
| * | | | | blame,cat-file: Prepare --textconv tests for correctly-failing conversion pro... | Kirill Smelkov | 2010-09-29 | 2 | -12/+14 |
* | | | | | Merge branch 'bc/fortran-userdiff' into maint | Junio C Hamano | 2010-12-02 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | userdiff.c: add builtin fortran regex patterns | Brandon Casey | 2010-09-10 | 1 | -1/+1 |
* | | | | | | Merge branch 'kb/maint-diff-ws-check' into maint | Junio C Hamano | 2010-11-24 | 3 | -44/+114 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: handle lines containing only whitespace and tabs better | Kevin Ballard | 2010-10-20 | 1 | -0/+37 |
| * | | | | | | test-lib: extend test_decode_color to handle more color codes | Kevin Ballard | 2010-10-20 | 2 | -44/+77 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jm/mailmap' into maint | Junio C Hamano | 2010-11-24 | 1 | -12/+55 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t4203: do not let "git shortlog" DWIM based on tty | Junio C Hamano | 2010-10-19 | 1 | -2/+2 |
| * | | | | | | t4203 (mailmap): stop hardcoding commit ids and dates | Jonathan Nieder | 2010-10-18 | 1 | -9/+17 |
| * | | | | | | mailmap: fix use of freed memory | Jim Meyering | 2010-10-13 | 1 | -3/+38 |
* | | | | | | | Merge branch 'jk/maint-apply-no-binary' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply: don't segfault on binary files with missing data | Jeff King | 2010-10-29 | 1 | -1/+26 |
* | | | | | | | | Merge branch 'ak/submodule-sync' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule sync: Update "submodule.<name>.url" for empty directories | Andreas Köhler | 2010-10-13 | 1 | -1/+11 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/maint-rev-list-nul' into maint | Junio C Hamano | 2010-11-24 | 3 | -4/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rev-list: handle %x00 NUL in user format | Jeff King | 2010-10-13 | 3 | -4/+12 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'cb/diff-fname-optim' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+109 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add rebase patch id tests | Clemens Buchacher | 2010-09-23 | 1 | -0/+109 |
* | | | | | | | | | Merge branch 'jk/no-textconv-symlink' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | diff: don't use pathname-based diff drivers for symlinks | Jeff King | 2010-09-23 | 1 | -0/+26 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'bc/fix-cherry-pick-root' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin/revert.c: don't dereference a NULL pointer | Brandon Casey | 2010-09-27 | 1 | -0/+10 |
* | | | | | | | | | Merge branch 'tr/send-email-refuse-sending-unedited-cover-letter' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+36 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | send-email: Refuse to send cover-letter template subject | Thomas Rast | 2010-09-08 | 1 | -0/+36 |
* | | | | | | | | | | t3402: test "rebase -s<strategy> -X<opt>" | Junio C Hamano | 2010-11-11 | 1 | -0/+21 |
* | | | | | | | | | | dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout | Nguyễn Thái Ngọc Duy | 2010-11-08 | 1 | -3/+7 |
| |_|_|_|_|/ / / / |/| | | | | | | | | |||||
* | | | | | | | | | t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To' | Antonio Ospite | 2010-10-19 | 1 | -1/+1 |
* | | | | | | | | | Update test script annotate-tests.sh to handle missing/extra authors | Kevin Ballard | 2010-10-19 | 1 | -6/+6 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | shell portability: no "export VAR=VAL" | Junio C Hamano | 2010-10-13 | 3 | -20/+20 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | t/t3415: use && where applicable. | Yann Dirson | 2010-10-06 | 1 | -3/+3 |
* | | | | | | | Merge early part of git-svn into maint | Junio C Hamano | 2010-10-05 | 1 | -0/+50 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-svn: check_cherry_pick should exclude commits already in our history | Steven Walter | 2010-09-24 | 1 | -0/+50 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | t3020 (ls-files-error-unmatch): remove stray '1' from end of file | Elijah Newren | 2010-10-03 | 1 | -1/+0 |
* | | | | | | | t0004 (unwritable files): simplify error handling | Jonathan Nieder | 2010-09-30 | 1 | -38/+14 |
* | | | | | | | stash: fix git stash branch regression when branch creation fails | Jon Seymour | 2010-09-29 | 1 | -1/+1 |
* | | | | | | | stash drops the stash even if creating the branch fails because it already ex... | Tomas Carnecky | 2010-09-29 | 1 | -0/+11 |
* | | | | | | | t6050 (replace): fix bogus "fetch branch with replacement" test | Christian Couder | 2010-09-27 | 1 | -3/+10 |
* | | | | | | | prefer test -h over test -L in shell scripts | Jeff King | 2010-09-27 | 2 | -4/+4 |
* | | | | | | | t1503: Fix arithmetic expansion syntax error when using dash | Ramsay Jones | 2010-09-27 | 1 | -2/+2 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | git-stash: fix flag parsing | Brian Gernhardt | 2010-09-26 | 1 | -4/+4 |
* | | | | | | t/t3903-stash: improve testing of git-stash show | Brandon Casey | 2010-09-26 | 1 | -4/+58 |
|/ / / / / |