Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cn/maint-branch-with-bad' into maint | Junio C Hamano | 2012-03-05 | 1 | -0/+4 |
|\ | |||||
| * | branch: don't assume the merge filter ref exists | Carlos Martín Nieto | 2012-02-27 | 1 | -0/+4 |
* | | Merge branch 'jn/maint-gitweb-invalid-regexp' into maint | Junio C Hamano | 2012-03-05 | 1 | -0/+10 |
|\ \ | |||||
| * | | gitweb: Handle invalid regexp in regexp search | Jakub Narebski | 2012-02-28 | 1 | -0/+10 |
* | | | Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint | Junio C Hamano | 2012-03-05 | 1 | -0/+86 |
|\ \ \ | |||||
| * | | | do not stream large files to pack when filters are in use | Jeff King | 2012-02-24 | 1 | -0/+86 |
* | | | | Merge branch 'tr/maint-bundle-long-subject' into maint | Junio C Hamano | 2012-03-05 | 1 | -24/+23 |
|\ \ \ \ | |||||
| * | | | | t5704: match tests to modern style | Thomas Rast | 2012-02-23 | 1 | -25/+8 |
| * | | | | bundle: use a strbuf to scan the log for boundary commits | Thomas Rast | 2012-02-23 | 1 | -0/+16 |
| |/ / / | |||||
* | | | | t0300: work around bug in dash 0.5.6 | Michael J Gruber | 2012-03-03 | 1 | -1/+4 |
* | | | | t5512 (ls-remote): modernize style | Tom Grennan | 2012-03-03 | 1 | -23/+4 |
* | | | | tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh | Stefano Lattarini | 2012-03-02 | 1 | -4/+5 |
* | | | | Merge branch 'jn/gitweb-unborn-head' into maint | Junio C Hamano | 2012-02-28 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | gitweb: Fix "heads" view when there is no current branch | Jakub Narebski | 2012-02-17 | 1 | -0/+9 |
* | | | | | Merge branch 'jc/add-refresh-unmerged' into maint | Junio C Hamano | 2012-02-27 | 1 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | refresh_index: do not show unmerged path that is outside pathspec | Junio C Hamano | 2012-02-17 | 1 | -0/+15 |
* | | | | | | Sync with 1.7.8.5 | Junio C Hamano | 2012-02-27 | 1 | -0/+10 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | am: don't infloop for an empty input file | Jim Meyering | 2012-02-27 | 1 | -0/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | git-p4: remove bash-ism in t9800 | Pete Wyckoff | 2012-02-27 | 1 | -9/+15 |
* | | | | | git-p4: remove bash-ism in t9809 | Pete Wyckoff | 2012-02-27 | 1 | -1/+1 |
* | | | | | git-p4: fix submit regression with clientSpec and subdir clone | Pete Wyckoff | 2012-02-27 | 1 | -11/+131 |
* | | | | | git-p4: set useClientSpec variable on initial clone | Pete Wyckoff | 2012-02-27 | 1 | -0/+17 |
* | | | | | Merge branch 'cb/receive-pack-keep-errors' into maint | Junio C Hamano | 2012-02-22 | 1 | -4/+18 |
|\ \ \ \ \ | |||||
| * | | | | | do not override receive-pack errors | Clemens Buchacher | 2012-02-13 | 1 | -4/+18 |
| |/ / / / | |||||
* | | | | | Merge branch 'cb/transfer-no-progress' into maint | Junio C Hamano | 2012-02-22 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | push/fetch/clone --no-progress suppresses progress output | Clemens Buchacher | 2012-02-13 | 1 | -1/+2 |
* | | | | | | Merge branch 'jk/git-dir-lookup' into maint | Junio C Hamano | 2012-02-22 | 1 | -0/+100 |
|\ \ \ \ \ \ | |||||
| * | | | | | | standardize and improve lookup rules for external local repos | Jeff King | 2012-02-03 | 1 | -0/+100 |
* | | | | | | | Merge branch 'cb/maint-rev-list-verify-object' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git rev-list: fix invalid typecast | Clemens Buchacher | 2012-02-13 | 1 | -0/+26 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-19 | 1 | -0/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | diff-index: enable recursive pathspec matching in unpack_trees | Nguyen Thai Ngoc Duy | 2012-01-19 | 1 | -0/+8 |
* | | | | | | | | Merge branch 'cb/maint-t5541-make-server-port-portable' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5541: check error message against the real port number used | Clemens Buchacher | 2012-02-13 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/grep-binary-attribute' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | grep: respect diff attributes for binary-ness | Jeff King | 2012-02-02 | 1 | -0/+24 |
* | | | | | | | | | | Merge branch 'nd/diffstat-gramnum' into maint | Junio C Hamano | 2012-02-21 | 64 | -109/+109 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use correct grammar in diffstat summary line | Nguyễn Thái Ngọc Duy | 2012-02-04 | 64 | -109/+109 |
| |/ / / / / / / / / | |||||
* | | | | | | / / / | gitweb: Fix 'grep' search for multiple matches in file | Jakub Narebski | 2012-02-20 | 1 | -0/+39 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-02-16 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git checkout -b: allow switching out of an unborn branch | Junio C Hamano | 2012-02-07 | 1 | -1/+10 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/maint-commit-ignore-i-t-a' into maint | Junio C Hamano | 2012-02-16 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | commit: ignore intent-to-add entries instead of refusing | Junio C Hamano | 2012-02-07 | 1 | -3/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/maint-tag-show-fixes' into maint | Junio C Hamano | 2012-02-14 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tag: do not show non-tag contents with "-n" | Junio C Hamano | 2012-02-09 | 1 | -0/+13 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jn/merge-no-edit-fix' into maint | Junio C Hamano | 2012-02-14 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | merge: do not launch an editor on "--no-edit $tag" | Junio C Hamano | 2012-02-09 | 1 | -0/+12 |
* | | | | | | | | Merge branch 'jc/parse-date-raw' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | parse_date(): '@' prefix forces git-timestamp | Junio C Hamano | 2012-02-04 | 1 | -0/+23 |
* | | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint | Junio C Hamano | 2012-02-13 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | |