Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | branch/checkout --track: Ensure that upstream branch is indeed a branch | Johan Herland | 2011-02-16 | 3 | -15/+31 |
* | Merge branch 'jk/maint-decorate-01-bool' into maint | Junio C Hamano | 2010-12-10 | 1 | -0/+9 |
|\ | |||||
| * | log.decorate: accept 0/1 bool values | Jeff King | 2010-11-17 | 1 | -0/+9 |
* | | Merge branch 'mg/maint-tag-rfc1991' into maint | Junio C Hamano | 2010-12-10 | 1 | -0/+66 |
|\ \ | |||||
| * | | tag: recognize rfc1991 signatures | Michael J Gruber | 2010-11-10 | 1 | -6/+6 |
| * | | t/t7004-tag: test handling of rfc1991 signatures | Michael J Gruber | 2010-11-10 | 1 | -0/+66 |
* | | | Merge branch 'jn/cherry-pick-refresh-index' into maint | Junio C Hamano | 2010-12-09 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | cherry-pick/revert: transparently refresh index | Jonathan Nieder | 2010-11-10 | 1 | -0/+10 |
| |/ / | |||||
* | | | Merge branch 'fc/apply-p2-get-header-name' into maint | Junio C Hamano | 2010-12-09 | 1 | -0/+26 |
|\ \ \ | |||||
| * | | | test: git-apply -p2 rename/chmod only | Junio C Hamano | 2010-11-05 | 1 | -0/+26 |
| |/ / | |||||
* | | | Merge branch 'ak/apply-non-git-epoch' into maint | Junio C Hamano | 2010-12-09 | 4 | -0/+28 |
|\ \ \ | |||||
| * | | | apply: handle patches with funny filename and colon in timezone | Jonathan Nieder | 2010-11-10 | 3 | -0/+26 |
| * | | | apply: Recognize epoch timestamps with : in the timezone | Anders Kaseorg | 2010-10-13 | 1 | -0/+2 |
* | | | | Merge branch 'cm/diff-check-at-eol' into maint | Junio C Hamano | 2010-12-09 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | diff --check: correct line numbers of new blank lines at EOF | Christoph Mallon | 2010-10-16 | 1 | -0/+9 |
* | | | | | Merge branch 'tc/smart-http-post-redirect' into maint | Junio C Hamano | 2010-12-09 | 2 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | smart-http: Don't change POST to GET when following redirect | Tay Ray Chuan | 2010-09-27 | 2 | -0/+15 |
* | | | | | | Merge branch 'ab/require-perl-5.8' into maint | Junio C Hamano | 2010-12-09 | 2 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | perl: bump the required Perl version to 5.8 from 5.6.[21] | Ævar Arnfjörð Bjarmason | 2010-09-27 | 2 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | 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 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | |